From: Aurelien Jarno <aurelien@aurel32.net>
To: Alexander Graf <agraf@suse.de>
Cc: peter.maydell@linaro.org, Riku Voipio <riku.voipio@iki.fi>,
QEMU-devel Developers <qemu-devel@nongnu.org>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [Qemu-devel] [PATCH 04/15] linux-user: define a couple of syscalls for non-uid16 targets
Date: Sun, 10 Apr 2011 22:25:18 +0200 [thread overview]
Message-ID: <20110410202518.GH4551@volta.aurel32.net> (raw)
In-Reply-To: <1301927544-32767-5-git-send-email-agraf@suse.de>
On Mon, Apr 04, 2011 at 04:32:13PM +0200, Alexander Graf wrote:
> From: Ulrich Hecht <uli@suse.de>
>
> Quite a number of syscalls are only defined on systems with USE_UID16
> defined; this patch defines them on other systems as well.
>
> Fixes a large number of uid/gid-related testcases on the s390x target
> (and most likely on other targets as well)
>
> Signed-off-by: Ulrich Hecht <uli@suse.de>
> ---
> linux-user/syscall.c | 125 ++++++++++++++++++++++++++++++++++++++++++--------
> 1 files changed, 105 insertions(+), 20 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index fabe815..0bce466 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -326,7 +326,7 @@ static int sys_fchmodat(int dirfd, const char *pathname, mode_t mode)
> return (fchmodat(dirfd, pathname, mode, 0));
> }
> #endif
> -#if defined(TARGET_NR_fchownat) && defined(USE_UID16)
> +#if defined(TARGET_NR_fchownat)
> static int sys_fchownat(int dirfd, const char *pathname, uid_t owner,
> gid_t group, int flags)
> {
> @@ -435,7 +435,7 @@ _syscall3(int,sys_faccessat,int,dirfd,const char *,pathname,int,mode)
> #if defined(TARGET_NR_fchmodat) && defined(__NR_fchmodat)
> _syscall3(int,sys_fchmodat,int,dirfd,const char *,pathname, mode_t,mode)
> #endif
> -#if defined(TARGET_NR_fchownat) && defined(__NR_fchownat) && defined(USE_UID16)
> +#if defined(TARGET_NR_fchownat) && defined(__NR_fchownat)
> _syscall5(int,sys_fchownat,int,dirfd,const char *,pathname,
> uid_t,owner,gid_t,group,int,flags)
> #endif
> @@ -6817,18 +6817,35 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> case TARGET_NR_setfsgid:
> ret = get_errno(setfsgid(arg1));
> break;
> +#else /* USE_UID16 */
> +#if defined(TARGET_NR_fchownat) && defined(__NR_fchownat)
> + case TARGET_NR_fchownat:
> + if (!(p = lock_user_string(arg2)))
> + goto efault;
> + ret = get_errno(sys_fchownat(arg1, p, arg3, arg4, arg5));
> + unlock_user(p, arg2, 0);
> + break;
> +#endif
> #endif /* USE_UID16 */
>
> -#ifdef TARGET_NR_lchown32
> +#if defined(TARGET_NR_lchown32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_lchown32)
> case TARGET_NR_lchown32:
> +#else
> + case TARGET_NR_lchown:
> +#endif
> if (!(p = lock_user_string(arg1)))
> goto efault;
> ret = get_errno(lchown(p, arg2, arg3));
> unlock_user(p, arg1, 0);
> break;
> #endif
> -#ifdef TARGET_NR_getuid32
> +#if defined(TARGET_NR_getuid32) || (defined(TARGET_NR_getuid) && !defined(USE_UID16))
> +#if defined(TARGET_NR_getuid32)
> case TARGET_NR_getuid32:
> +#else
> + case TARGET_NR_getuid:
> +#endif
> ret = get_errno(getuid());
> break;
> #endif
> @@ -6973,33 +6990,57 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> break;
> #endif
>
> -#ifdef TARGET_NR_getgid32
> +#if defined(TARGET_NR_getgid32) || (defined(TARGET_NR_getgid) && !defined(USE_UID16))
> +#if defined(TARGET_NR_getgid32)
> case TARGET_NR_getgid32:
> +#else
> + case TARGET_NR_getgid:
> +#endif
> ret = get_errno(getgid());
> break;
> #endif
> -#ifdef TARGET_NR_geteuid32
> +#if defined(TARGET_NR_geteuid32) || (defined(TARGET_NR_geteuid) && !defined(USE_UID16))
> +#if defined(TARGET_NR_geteuid32)
> case TARGET_NR_geteuid32:
> +#else
> + case TARGET_NR_geteuid:
> +#endif
> ret = get_errno(geteuid());
> break;
> #endif
> -#ifdef TARGET_NR_getegid32
> +#if defined(TARGET_NR_getegid32) || (defined(TARGET_NR_getegid) && !defined(USE_UID16))
> +#if defined(TARGET_NR_getegid32)
> case TARGET_NR_getegid32:
> +#else
> + case TARGET_NR_getegid:
> +#endif
> ret = get_errno(getegid());
> break;
> #endif
> -#ifdef TARGET_NR_setreuid32
> +#if defined(TARGET_NR_setreuid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setreuid32)
> case TARGET_NR_setreuid32:
> +#else
> + case TARGET_NR_setreuid:
> +#endif
> ret = get_errno(setreuid(arg1, arg2));
> break;
> #endif
> -#ifdef TARGET_NR_setregid32
> +#if defined(TARGET_NR_setregid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setregid32)
> case TARGET_NR_setregid32:
> +#else
> + case TARGET_NR_setregid:
> +#endif
> ret = get_errno(setregid(arg1, arg2));
> break;
> #endif
> -#ifdef TARGET_NR_getgroups32
> +#if defined(TARGET_NR_getgroups32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_getgroups32)
> case TARGET_NR_getgroups32:
> +#else
> + case TARGET_NR_getgroups:
> +#endif
> {
> int gidsetsize = arg1;
> uint32_t *target_grouplist;
> @@ -7023,8 +7064,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> }
> break;
> #endif
> -#ifdef TARGET_NR_setgroups32
> +#if defined(TARGET_NR_setgroups32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setgroups32)
> case TARGET_NR_setgroups32:
> +#else
> + case TARGET_NR_setgroups:
> +#endif
> {
> int gidsetsize = arg1;
> uint32_t *target_grouplist;
> @@ -7044,18 +7089,30 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> }
> break;
> #endif
> -#ifdef TARGET_NR_fchown32
> +#if defined(TARGET_NR_fchown32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_fchown32)
> case TARGET_NR_fchown32:
> +#else
> + case TARGET_NR_fchown:
> +#endif
> ret = get_errno(fchown(arg1, arg2, arg3));
> break;
> #endif
> -#ifdef TARGET_NR_setresuid32
> +#if defined(TARGET_NR_setresuid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setresuid32)
> case TARGET_NR_setresuid32:
> +#else
> + case TARGET_NR_setresuid:
> +#endif
> ret = get_errno(setresuid(arg1, arg2, arg3));
> break;
> #endif
> -#ifdef TARGET_NR_getresuid32
> +#if defined(TARGET_NR_getresuid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_getresuid32)
> case TARGET_NR_getresuid32:
> +#else
> + case TARGET_NR_getresuid:
> +#endif
> {
> uid_t ruid, euid, suid;
> ret = get_errno(getresuid(&ruid, &euid, &suid));
> @@ -7068,13 +7125,21 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> }
> break;
> #endif
> -#ifdef TARGET_NR_setresgid32
> +#if defined(TARGET_NR_setresgid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setresgid32)
> case TARGET_NR_setresgid32:
> +#else
> + case TARGET_NR_setresgid:
> +#endif
> ret = get_errno(setresgid(arg1, arg2, arg3));
> break;
> #endif
> +#if defined(TARGET_NR_getresgid32) || !defined(USE_UID16)
> #ifdef TARGET_NR_getresgid32
> case TARGET_NR_getresgid32:
> +#else
> + case TARGET_NR_getresgid:
> +#endif
> {
> gid_t rgid, egid, sgid;
> ret = get_errno(getresgid(&rgid, &egid, &sgid));
> @@ -7087,31 +7152,51 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
> }
> break;
> #endif
> -#ifdef TARGET_NR_chown32
> +#if defined(TARGET_NR_chown32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_chown32)
> case TARGET_NR_chown32:
> +#else
> + case TARGET_NR_chown:
> +#endif
> if (!(p = lock_user_string(arg1)))
> goto efault;
> ret = get_errno(chown(p, arg2, arg3));
> unlock_user(p, arg1, 0);
> break;
> #endif
> -#ifdef TARGET_NR_setuid32
> +#if defined(TARGET_NR_setuid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setuid32)
> case TARGET_NR_setuid32:
> +#else
> + case TARGET_NR_setuid:
> +#endif
> ret = get_errno(setuid(arg1));
> break;
> #endif
> -#ifdef TARGET_NR_setgid32
> +#if defined(TARGET_NR_setgid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setgid32)
> case TARGET_NR_setgid32:
> +#else
> + case TARGET_NR_setgid:
> +#endif
> ret = get_errno(setgid(arg1));
> break;
> #endif
> -#ifdef TARGET_NR_setfsuid32
> +#if defined(TARGET_NR_setfsuid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setfsuid32)
> case TARGET_NR_setfsuid32:
> +#else
> + case TARGET_NR_setfsuid:
> +#endif
> ret = get_errno(setfsuid(arg1));
> break;
> #endif
> -#ifdef TARGET_NR_setfsgid32
> +#if defined(TARGET_NR_setfsgid32) || !defined(USE_UID16)
> +#if defined(TARGET_NR_setfsgid32)
> case TARGET_NR_setfsgid32:
> +#else
> + case TARGET_NR_setfsgid:
> +#endif
> ret = get_errno(setfsgid(arg1));
> break;
> #endif
This patch looks fine to me. That said as for the previous patch, I
don't know very well linux-user, and I would appreciate if someone with
a good knowledge of linux-user can review it. Riku maybe (CC:ed)?
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
next prev parent reply other threads:[~2011-04-10 20:25 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-04 14:32 [Qemu-devel] [PATCH 00/15] s390x emulation support v3 Alexander Graf
2011-04-04 14:32 ` [Qemu-devel] [PATCH 01/15] s390x: fix virtio feature bitmap Alexander Graf
2011-04-10 19:25 ` Aurelien Jarno
2011-04-10 19:26 ` Alexander Graf
2011-04-10 20:06 ` Aurelien Jarno
2011-04-10 20:11 ` Alexander Graf
2011-04-10 20:26 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 02/15] s390x: set alignment for long to 8 Alexander Graf
2011-04-10 19:25 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 03/15] s390x: s390x-linux-user support Alexander Graf
2011-04-10 20:16 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 04/15] linux-user: define a couple of syscalls for non-uid16 targets Alexander Graf
2011-04-10 20:25 ` Aurelien Jarno [this message]
2011-04-04 14:32 ` [Qemu-devel] [PATCH 05/15] s390x: Enable s390x-softmmu target Alexander Graf
2011-04-10 20:34 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 06/15] s390x: Dispatch interrupts to KVM or the real CPU Alexander Graf
2011-04-10 20:37 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 07/15] s390x: Adjust GDB stub Alexander Graf
2011-04-10 20:39 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 08/15] s390x: virtio machine storage keys Alexander Graf
2011-04-10 20:41 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 09/15] s390x: Prepare cpu.h for emulation Alexander Graf
2011-04-12 21:32 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 10/15] s390x: helper functions for system emulation Alexander Graf
2011-04-12 21:32 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 11/15] s390x: Implement opcode helpers Alexander Graf
2011-04-12 21:32 ` Aurelien Jarno
2011-04-13 5:20 ` Alexander Graf
2011-04-04 14:32 ` [Qemu-devel] [PATCH 12/15] s390x: Adjust internal kvm code Alexander Graf
2011-04-12 21:32 ` Aurelien Jarno
2011-04-04 14:32 ` [Qemu-devel] [PATCH 13/15] s390x: translate engine for s390x CPU Alexander Graf
2011-04-04 14:32 ` [Qemu-devel] [PATCH 14/15] s390x: build s390x by default Alexander Graf
2011-04-04 14:32 ` [Qemu-devel] [PATCH 15/15] tcg: use ext op for deposit Alexander Graf
2011-04-05 4:54 ` Aurelien Jarno
2011-04-05 7:55 ` Alexander Graf
2011-04-10 19:23 ` Aurelien Jarno
2011-04-10 19:25 ` Alexander Graf
2011-04-10 20:08 ` Aurelien Jarno
2011-04-10 20:17 ` Alexander Graf
2011-04-10 20:28 ` Aurelien Jarno
2011-04-14 16:27 ` Alexander Graf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110410202518.GH4551@volta.aurel32.net \
--to=aurelien@aurel32.net \
--cc=agraf@suse.de \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.