[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] linux-user: Fix getresuid, getresgid if !USE_UI
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 4/5] linux-user: Fix getresuid, getresgid if !USE_UID16 |
Date: |
Sun, 2 Mar 2014 19:36:41 +0000 |
The size of the UID/GID types depends on whether USE_UID16 is
defined. Define a new put_user_id() which writes a uid/gid
type to guest memory. This fixes getresuid and getresgid, which
were always storing 16 bits even if the uid type was 32 bits.
Reported-by: Michael Matz <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
The SuSE 1.6 tree has a fix for this bug (hence the
reported-by:) but I preferred to fix it in a different
way to avoid introducing more ifdefs.
---
linux-user/syscall.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1407b7a..ccdbc4e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4528,6 +4528,9 @@ static inline int tswapid(int id)
{
return tswap16(id);
}
+
+#define put_user_id(x, gaddr) put_user_u16(x, gaddr)
+
#else /* !USE_UID16 */
static inline int high2lowuid(int uid)
{
@@ -4549,6 +4552,9 @@ static inline int tswapid(int id)
{
return tswap32(id);
}
+
+#define put_user_id(x, gaddr) put_user_u32(x, gaddr)
+
#endif /* USE_UID16 */
void syscall_init(void)
@@ -7805,9 +7811,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
uid_t ruid, euid, suid;
ret = get_errno(getresuid(&ruid, &euid, &suid));
if (!is_error(ret)) {
- if (put_user_u16(high2lowuid(ruid), arg1)
- || put_user_u16(high2lowuid(euid), arg2)
- || put_user_u16(high2lowuid(suid), arg3))
+ if (put_user_id(high2lowuid(ruid), arg1)
+ || put_user_id(high2lowuid(euid), arg2)
+ || put_user_id(high2lowuid(suid), arg3))
goto efault;
}
}
@@ -7826,9 +7832,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
gid_t rgid, egid, sgid;
ret = get_errno(getresgid(&rgid, &egid, &sgid));
if (!is_error(ret)) {
- if (put_user_u16(high2lowgid(rgid), arg1)
- || put_user_u16(high2lowgid(egid), arg2)
- || put_user_u16(high2lowgid(sgid), arg3))
+ if (put_user_id(high2lowgid(rgid), arg1)
+ || put_user_id(high2lowgid(egid), arg2)
+ || put_user_id(high2lowgid(sgid), arg3))
goto efault;
}
}
--
1.9.0
- [Qemu-devel] [PATCH 0/5] linux-user: various fixes for AArch64, Peter Maydell, 2014/03/02
- [Qemu-devel] [PATCH 2/5] linux-user: AArch64: Implement SA_RESTORER for signal handlers, Peter Maydell, 2014/03/02
- [Qemu-devel] [PATCH 1/5] linux-user/signal.c: Fix AArch64 big-endian FP register restore, Peter Maydell, 2014/03/02
- [Qemu-devel] [PATCH 3/5] linux-user: Don't use UID16 on AArch64, Peter Maydell, 2014/03/02
- [Qemu-devel] [PATCH 4/5] linux-user: Fix getresuid, getresgid if !USE_UID16,
Peter Maydell <=
- [Qemu-devel] [PATCH 5/5] linux-user: Implement sendmmsg syscall, Peter Maydell, 2014/03/02
- Re: [Qemu-devel] [PATCH 0/5] linux-user: various fixes for AArch64, Richard Henderson, 2014/03/03
- Re: [Qemu-devel] [PATCH 0/5] linux-user: various fixes for AArch64, Riku Voipio, 2014/03/03