[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 037/108] linux-user: Split out readlink, readlink
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 037/108] linux-user: Split out readlink, readlinkat |
Date: |
Sat, 9 Jun 2018 17:01:09 -1000 |
All targets define readlinkat; remove the ifdef.
Unify the two with do_readlinkat so that we do not
replicate the /proc/self/exe handling.
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/syscall.c | 96 ++++++++++++++++++++------------------------
1 file changed, 43 insertions(+), 53 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 39d8a70d7d..f1123479df 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8712,6 +8712,45 @@ IMPL(read)
return ret;
}
+static abi_long do_readlinkat(abi_long dirfd, abi_long target_path,
+ abi_long target_buf, abi_long bufsize)
+{
+ char *host_path, *host_buf;
+ abi_long ret;
+
+ host_path = lock_user_string(target_path);
+ host_buf = lock_user(VERIFY_WRITE, target_buf, bufsize, 0);
+ if (!host_path || !host_buf) {
+ ret = -TARGET_EFAULT;
+ } else if (is_proc_myself(host_path, "exe")) {
+ char real[PATH_MAX], *temp;
+ temp = realpath(exec_path, real);
+ if (temp == NULL) {
+ ret = get_errno(-1);
+ } else {
+ ret = MIN(strlen(real), bufsize);
+ memcpy(host_buf, real, ret);
+ }
+ } else {
+ ret = get_errno(readlinkat(dirfd, path(host_path), host_buf, bufsize));
+ }
+ unlock_user(host_buf, target_buf, ret);
+ unlock_user(host_path, target_path, 0);
+ return ret;
+}
+
+#ifdef TARGET_NR_readlink
+IMPL(readlink)
+{
+ return do_readlinkat(AT_FDCWD, arg1, arg2, arg3);
+}
+#endif
+
+IMPL(readlinkat)
+{
+ return do_readlinkat(arg1, arg2, arg3, arg4);
+}
+
#ifdef TARGET_NR_rename
IMPL(rename)
{
@@ -9591,59 +9630,6 @@ static abi_long do_syscall1(void *cpu_env, unsigned num,
abi_long arg1,
void *p;
switch(num) {
-#ifdef TARGET_NR_readlink
- case TARGET_NR_readlink:
- {
- void *p2;
- p = lock_user_string(arg1);
- p2 = lock_user(VERIFY_WRITE, arg2, arg3, 0);
- if (!p || !p2) {
- ret = -TARGET_EFAULT;
- } else if (!arg3) {
- /* Short circuit this for the magic exe check. */
- ret = -TARGET_EINVAL;
- } else if (is_proc_myself((const char *)p, "exe")) {
- char real[PATH_MAX], *temp;
- temp = realpath(exec_path, real);
- /* Return value is # of bytes that we wrote to the buffer. */
- if (temp == NULL) {
- ret = get_errno(-1);
- } else {
- /* Don't worry about sign mismatch as earlier mapping
- * logic would have thrown a bad address error. */
- ret = MIN(strlen(real), arg3);
- /* We cannot NUL terminate the string. */
- memcpy(p2, real, ret);
- }
- } else {
- ret = get_errno(readlink(path(p), p2, arg3));
- }
- unlock_user(p2, arg2, ret);
- unlock_user(p, arg1, 0);
- }
- return ret;
-#endif
-#if defined(TARGET_NR_readlinkat)
- case TARGET_NR_readlinkat:
- {
- void *p2;
- p = lock_user_string(arg2);
- p2 = lock_user(VERIFY_WRITE, arg3, arg4, 0);
- if (!p || !p2) {
- ret = -TARGET_EFAULT;
- } else if (is_proc_myself((const char *)p, "exe")) {
- char real[PATH_MAX], *temp;
- temp = realpath(exec_path, real);
- ret = temp == NULL ? get_errno(-1) : strlen(real) ;
- snprintf((char *)p2, arg4, "%s", real);
- } else {
- ret = get_errno(readlinkat(arg1, path(p), p2, arg4));
- }
- unlock_user(p2, arg3, ret);
- unlock_user(p, arg2, 0);
- }
- return ret;
-#endif
#ifdef TARGET_NR_swapon
case TARGET_NR_swapon:
if (!(p = lock_user_string(arg1)))
@@ -12783,6 +12769,10 @@ static impl_fn *syscall_table(unsigned num)
SYSCALL(pipe2);
SYSCALL(pselect6);
SYSCALL(read);
+#ifdef TARGET_NR_readlink
+ SYSCALL(readlink);
+#endif
+ SYSCALL(readlinkat);
#ifdef TARGET_NR_rename
SYSCALL(rename);
#endif
--
2.17.1
- [Qemu-devel] [PATCH v2 026/108] linux-user: Split out ioctl, (continued)
- [Qemu-devel] [PATCH v2 026/108] linux-user: Split out ioctl, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 028/108] linux-user: Split out getpgrp, getppid, setsid, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 029/108] linux-user: Split out rt_sigaction, sigaction, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 030/108] linux-user: Split out rt_sigprocmask, sgetmask, sigprocmask, ssetmask, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 031/108] linux-user: Split out rt_sigpending, rt_sigsuspend, sigpending, sigsuspend, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 032/108] linux-user: Split out rt_sigqueueinfo, rt_sigtimedwait, rt_tgsigqueueinfo, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 033/108] linux-user: Split out rt_sigreturn, sethostname, setrlimit, sigreturn, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 036/108] linux-user: Split out symlink, symlinkat, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 035/108] linux-user: Split out select, pselect6, newselect, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 034/108] linux-user: Split out getrlimit, getrusage, gettimeofday, settimeofday, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 037/108] linux-user: Split out readlink, readlinkat,
Richard Henderson <=
- [Qemu-devel] [PATCH v2 038/108] linux-user: Split out mmap, mmap2, reboot, swapon, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 039/108] linux-user: Split out mprotect, mremap, msync, munmap, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 040/108] linux-user: Split out mlock, mlockall, munlock, munlockall, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 041/108] linux-user: Split out fchmod, fchmodat, ftruncate, truncate, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 042/108] linux-user: Split out fstatfs, fstatfs64, statfs, statfs64, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 043/108] linux-user: Split out getpriority, setpriority, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 044/108] linux-user: Split out socketcall, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 045/108] linux-user: Split out accept, accept4, bind, connect, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 046/108] linux-user: Split out 7 syscalls, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 047/108] linux-user: Split out recvmmsg, send, sendmmsg, sendmsg, sendto, Richard Henderson, 2018/06/09
- Prev by Date:
[Qemu-devel] [PATCH v2 034/108] linux-user: Split out getrlimit, getrusage, gettimeofday, settimeofday
- Next by Date:
[Qemu-devel] [PATCH v2 038/108] linux-user: Split out mmap, mmap2, reboot, swapon
- Previous by thread:
[Qemu-devel] [PATCH v2 034/108] linux-user: Split out getrlimit, getrusage, gettimeofday, settimeofday
- Next by thread:
[Qemu-devel] [PATCH v2 038/108] linux-user: Split out mmap, mmap2, reboot, swapon
- Index(es):