| Message ID | mvm607su9qs.fsf@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] linux-user: implement renameat2 | expand |
Le 23/01/2018 à 11:53, Andreas Schwab a écrit : > This is needed for new architectures like RISC-V which do not provide any > other rename-like syscall. > > Signed-off-by: Andreas Schwab <schwab@suse.de> > --- > linux-user/syscall.c | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 5e54889522..c258a0a44b 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -598,6 +598,24 @@ static int sys_utimensat(int dirfd, const char *pathname, > #endif > #endif /* TARGET_NR_utimensat */ > > +#ifdef TARGET_NR_renameat2 > +#if defined(__NR_renameat2) > +#define __NR_sys_renameat2 __NR_renameat2 > +_syscall5(int, sys_renameat2, int, oldfd, const char *, old, int, newfd, > + const char *, new, unsigned int, flags) > +#else > +static int sys_renameat2(int oldfd, const char *old, > + int newfd, const char *new, int flags) > +{ > + if (flags == 0) { > + return renameat(oldfd, old, newfd, new); > + } > + errno = ENOSYS; > + return -1; > +} > +#endif > +#endif /* TARGET_NR_renameat2 */ > + > #ifdef CONFIG_INOTIFY > #include <sys/inotify.h> > > @@ -8342,6 +8360,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, > } > break; > #endif > +#if defined(TARGET_NR_renameat2) > + case TARGET_NR_renameat2: > + { > + void *p2; > + p = lock_user_string(arg2); > + p2 = lock_user_string(arg4); > + if (!p || !p2) { > + ret = -TARGET_EFAULT; > + } else { > + ret = get_errno(sys_renameat2(arg1, p, arg3, p2, arg5)); > + } > + unlock_user(p2, arg4, 0); > + unlock_user(p, arg2, 0); > + } > + break; > +#endif > #ifdef TARGET_NR_mkdir > case TARGET_NR_mkdir: > if (!(p = lock_user_string(arg1))) > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5e54889522..c258a0a44b 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -598,6 +598,24 @@ static int sys_utimensat(int dirfd, const char *pathname, #endif #endif /* TARGET_NR_utimensat */ +#ifdef TARGET_NR_renameat2 +#if defined(__NR_renameat2) +#define __NR_sys_renameat2 __NR_renameat2 +_syscall5(int, sys_renameat2, int, oldfd, const char *, old, int, newfd, + const char *, new, unsigned int, flags) +#else +static int sys_renameat2(int oldfd, const char *old, + int newfd, const char *new, int flags) +{ + if (flags == 0) { + return renameat(oldfd, old, newfd, new); + } + errno = ENOSYS; + return -1; +} +#endif +#endif /* TARGET_NR_renameat2 */ + #ifdef CONFIG_INOTIFY #include <sys/inotify.h> @@ -8342,6 +8360,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, } break; #endif +#if defined(TARGET_NR_renameat2) + case TARGET_NR_renameat2: + { + void *p2; + p = lock_user_string(arg2); + p2 = lock_user_string(arg4); + if (!p || !p2) { + ret = -TARGET_EFAULT; + } else { + ret = get_errno(sys_renameat2(arg1, p, arg3, p2, arg5)); + } + unlock_user(p2, arg4, 0); + unlock_user(p, arg2, 0); + } + break; +#endif #ifdef TARGET_NR_mkdir case TARGET_NR_mkdir: if (!(p = lock_user_string(arg1)))
This is needed for new architectures like RISC-V which do not provide any other rename-like syscall. Signed-off-by: Andreas Schwab <schwab@suse.de> --- linux-user/syscall.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)