david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux-user: fix setgroups/getgroups for non-UID16 archs

Browse Source 
Don't assume target_id is a short.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Andreas Schwab 2013-04-09 05:41:33 +00:00 committed by Riku Voipio
parent 9ab709be59
commit 03903ffcfb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
linux-user/syscall.c
View File

@ -7743,12 +7743,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
if (gidsetsize == 0) if (gidsetsize == 0)
break; break;
if (!is_error(ret)) { if (!is_error(ret)) {
target_grouplist = lock_user(VERIFY_WRITE, arg2, gidsetsize * 2, 0); target_grouplist = lock_user(VERIFY_WRITE, arg2, gidsetsize * sizeof(target_id), 0);
if (!target_grouplist) if (!target_grouplist)
goto efault; goto efault;
for(i = 0;i < ret; i++) for(i = 0;i < ret; i++)
target_grouplist[i] = tswapid(high2lowgid(grouplist[i])); target_grouplist[i] = tswapid(high2lowgid(grouplist[i]));
unlock_user(target_grouplist, arg2, gidsetsize * 2); unlock_user(target_grouplist, arg2, gidsetsize * sizeof(target_id));
} }
} }
break; break;
@ -7760,7 +7760,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
int i; int i;
if (gidsetsize) { if (gidsetsize) {
grouplist = alloca(gidsetsize * sizeof(gid_t)); grouplist = alloca(gidsetsize * sizeof(gid_t));
target_grouplist = lock_user(VERIFY_READ, arg2, gidsetsize * 2, 1); target_grouplist = lock_user(VERIFY_READ, arg2, gidsetsize * sizeof(target_id), 1);
if (!target_grouplist) { if (!target_grouplist) {
ret = -TARGET_EFAULT; ret = -TARGET_EFAULT;
goto fail; goto fail;