mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-user: redirect openat calls

Browse Source 
While Mikhail fixed /proc/self/maps, it was noticed openat calls are
not redirected currently. Some archs don't have open at all, so
openat needs to be redirected.

Fix this by consolidating open/openat code to do_openat - open
is implemented using openat(AT_FDCWD, ... ), which according
to open(2) man page is identical.

Since all targets now have openat, remove the ifdef around sys_openat
and openat: case in do_syscall.

Cc: Mikhail Ilin <m.ilin@samsung.com>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Riku Voipio 2014-08-06 10:36:37 +03:00
parent d67f4aaae8
commit 0b2effd744
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
linux-user/syscall.c
View File

@ -294,7 +294,6 @@ static int sys_getcwd1(char *buf, size_t size)
return strlen(buf)+1; return strlen(buf)+1;
} }
#ifdef TARGET_NR_openat
static int sys_openat(int dirfd, const char *pathname, int flags, mode_t mode) static int sys_openat(int dirfd, const char *pathname, int flags, mode_t mode)
{ {
/* /*
@ -306,7 +305,6 @@ static int sys_openat(int dirfd, const char *pathname, int flags, mode_t mode)
} }
return (openat(dirfd, pathname, flags)); return (openat(dirfd, pathname, flags));
} }
#endif
#ifdef TARGET_NR_utimensat #ifdef TARGET_NR_utimensat
#ifdef CONFIG_UTIMENSAT #ifdef CONFIG_UTIMENSAT
@ -5274,7 +5272,7 @@ static int open_net_route(void *cpu_env, int fd)
} }
#endif #endif
static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode) static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags, mode_t mode)
{ {
struct fake_open { struct fake_open {
const char *filename; const char *filename;
@ -5295,7 +5293,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
if (is_proc_myself(pathname, "exe")) { if (is_proc_myself(pathname, "exe")) {
int execfd = qemu_getauxval(AT_EXECFD); int execfd = qemu_getauxval(AT_EXECFD);
return execfd ? execfd : get_errno(open(exec_path, flags, mode)); return execfd ? execfd : get_errno(sys_openat(dirfd, exec_path, flags, mode));
} }
for (fake_open = fakes; fake_open->filename; fake_open++) { for (fake_open = fakes; fake_open->filename; fake_open++) {
@ -5329,7 +5327,7 @@ static int do_open(void *cpu_env, const char *pathname, int flags, mode_t mode)
return fd; return fd;
} }
return get_errno(open(path(pathname), flags, mode)); return get_errno(sys_openat(dirfd, path(pathname), flags, mode));
} }
/* do_syscall() should always have a single exit point at the end so /* do_syscall() should always have a single exit point at the end so
@ -5404,22 +5402,19 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_open: case TARGET_NR_open:
if (!(p = lock_user_string(arg1))) if (!(p = lock_user_string(arg1)))
goto efault; goto efault;
ret = get_errno(do_open(cpu_env, p, ret = get_errno(do_openat(cpu_env, AT_FDCWD, p,
target_to_host_bitmask(arg2, fcntl_flags_tbl), target_to_host_bitmask(arg2, fcntl_flags_tbl),
arg3)); arg3));
unlock_user(p, arg1, 0); unlock_user(p, arg1, 0);
break; break;
#if defined(TARGET_NR_openat) && defined(__NR_openat)
case TARGET_NR_openat: case TARGET_NR_openat:
if (!(p = lock_user_string(arg2))) if (!(p = lock_user_string(arg2)))
goto efault; goto efault;
ret = get_errno(sys_openat(arg1, ret = get_errno(do_openat(cpu_env, arg1, p,
path(p), target_to_host_bitmask(arg3, fcntl_flags_tbl),
target_to_host_bitmask(arg3, fcntl_flags_tbl), arg4));
arg4));
unlock_user(p, arg2, 0); unlock_user(p, arg2, 0);
break; break;
#endif
case TARGET_NR_close: case TARGET_NR_close:
ret = get_errno(close(arg1)); ret = get_errno(close(arg1));
break; break;