[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 074/108] linux-user: Split out fchown, fchownat,
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH v2 074/108] linux-user: Split out fchown, fchownat, setresgid, setresuid |
Date: |
Sat, 9 Jun 2018 17:01:46 -1000 |
All targets define fchownat; remove the ifdef.
Signed-off-by: Richard Henderson <address@hidden>
---
linux-user/syscall.c | 66 +++++++++++++++++++++++++++++---------------
1 file changed, 43 insertions(+), 23 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 915e1f1a91..75b869fb33 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8103,6 +8103,25 @@ IMPL(fchmodat)
return ret;
}
+IMPL(fchown)
+{
+ return get_errno(fchown(arg1, low2highuid(arg2), low2highgid(arg3)));
+}
+
+IMPL(fchownat)
+{
+ char *p = lock_user_string(arg2);
+ abi_long ret;
+
+ if (!p) {
+ return -TARGET_EFAULT;
+ }
+ ret = get_errno(fchownat(arg1, p, low2highuid(arg3),
+ low2highgid(arg4), arg5));
+ unlock_user(p, arg2, 0);
+ return ret;
+}
+
#ifdef TARGET_NR_fcntl
IMPL(fcntl)
{
@@ -10540,6 +10559,22 @@ IMPL(setregid)
return get_errno(setregid(low2highgid(arg1), low2highgid(arg2)));
}
+#ifdef TARGET_NR_setresgid
+IMPL(setresgid)
+{
+ return get_errno(sys_setresgid(low2highgid(arg1), low2highgid(arg2),
+ low2highgid(arg3)));
+}
+#endif
+
+#ifdef TARGET_NR_setresuid
+IMPL(setresuid)
+{
+ return get_errno(sys_setresuid(low2highuid(arg1), low2highuid(arg2),
+ low2highuid(arg3)));
+}
+#endif
+
IMPL(setreuid)
{
return get_errno(setreuid(low2highuid(arg1), low2highuid(arg2)));
@@ -11512,23 +11547,6 @@ static abi_long do_syscall1(void *cpu_env, unsigned
num, abi_long arg1,
void *p;
switch(num) {
- case TARGET_NR_fchown:
- return get_errno(fchown(arg1, low2highuid(arg2), low2highgid(arg3)));
-#if defined(TARGET_NR_fchownat)
- case TARGET_NR_fchownat:
- if (!(p = lock_user_string(arg2)))
- return -TARGET_EFAULT;
- ret = get_errno(fchownat(arg1, p, low2highuid(arg3),
- low2highgid(arg4), arg5));
- unlock_user(p, arg2, 0);
- return ret;
-#endif
-#ifdef TARGET_NR_setresuid
- case TARGET_NR_setresuid:
- return get_errno(sys_setresuid(low2highuid(arg1),
- low2highuid(arg2),
- low2highuid(arg3)));
-#endif
#ifdef TARGET_NR_getresuid
case TARGET_NR_getresuid:
{
@@ -11543,12 +11561,6 @@ static abi_long do_syscall1(void *cpu_env, unsigned
num, abi_long arg1,
}
return ret;
#endif
-#ifdef TARGET_NR_getresgid
- case TARGET_NR_setresgid:
- return get_errno(sys_setresgid(low2highgid(arg1),
- low2highgid(arg2),
- low2highgid(arg3)));
-#endif
#ifdef TARGET_NR_getresgid
case TARGET_NR_getresgid:
{
@@ -13094,6 +13106,8 @@ static impl_fn *syscall_table(unsigned num)
SYSCALL(fchdir);
SYSCALL(fchmod);
SYSCALL(fchmodat);
+ SYSCALL(fchown);
+ SYSCALL(fchownat);
#ifdef TARGET_NR_fcntl
SYSCALL(fcntl);
#endif
@@ -13378,6 +13392,12 @@ static impl_fn *syscall_table(unsigned num)
SYSCALL(setpgid);
SYSCALL(setpriority);
SYSCALL(setregid);
+#ifdef TARGET_NR_setresgid
+ SYSCALL(setresgid);
+#endif
+#ifdef TARGET_NR_setresuid
+ SYSCALL(setresuid);
+#endif
SYSCALL(setreuid);
SYSCALL(setrlimit);
#ifdef TARGET_NR_setsockopt
--
2.17.1
- [Qemu-devel] [PATCH v2 064/108] linux-user: Split out sched syscalls, (continued)
- [Qemu-devel] [PATCH v2 064/108] linux-user: Split out sched syscalls, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 066/108] linux-user: Split out arch_prctl, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 067/108] linux-user: Split out getcwd, pread64, pwrite64, sigaltstack, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 068/108] linux-user: Split out capget, capset, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 070/108] linux-user: Split out ftruncate64, truncate64, ugetrlimit, vfork, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 069/108] linux-user: Split out sendfile, sendfile64, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 071/108] linux-user: Split out fstat64, fstatat64, newfstatat, lstat64, stat64, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 072/108] linux-user: Split out getegid, geteuid, getgid, getuid, lchown, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 073/108] linux-user: Split out getgroups, setgroups, setregid, setreuid, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 075/108] linux-user: Split out chown, getresgid, getresuid, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 074/108] linux-user: Split out fchown, fchownat, setresgid, setresuid,
Richard Henderson <=
- [Qemu-devel] [PATCH v2 076/108] linux-user: Split out setfsgid, setfsuid, setgid, setuid, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 077/108] linux-user: Split out getuid32, getxgid, getxuid, lchown32, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 079/108] linux-user: Split out getegid32, geteuid32, getgid32, setregid32, setreuid32, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 080/108] linux-user: Split out fchown32, getgroups32, setgroups32, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 078/108] linux-user: Split out osf_getsysinfo, osf_setsysinfo, osf_sigprocmask, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 081/108] linux-user: Split out getresgid32, getresuid32, setresgid32, setresuid32, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 082/108] linux-user: Split out chown32, setfsgid32, setfsuid32, setgid32, setuid32, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 083/108] linux-user: Split out mincore, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 084/108] linux-user: Split out fadvise64, fadvise64_64, Richard Henderson, 2018/06/09
- [Qemu-devel] [PATCH v2 085/108] linux-user: Split out cacheflush, fcntl64, getpagesize, madvise, Richard Henderson, 2018/06/09
- Prev by Date:
[Qemu-devel] [PATCH v2 075/108] linux-user: Split out chown, getresgid, getresuid
- Next by Date:
[Qemu-devel] [PATCH v2 076/108] linux-user: Split out setfsgid, setfsuid, setgid, setuid
- Previous by thread:
[Qemu-devel] [PATCH v2 075/108] linux-user: Split out chown, getresgid, getresuid
- Next by thread:
[Qemu-devel] [PATCH v2 076/108] linux-user: Split out setfsgid, setfsuid, setgid, setuid
- Index(es):