Commit 03903ffc authored by Andreas Schwab's avatar Andreas Schwab Committed by Riku Voipio
Browse files

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



Don't assume target_id is a short.

Signed-off-by: default avatarAndreas Schwab <schwab@suse.de>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 9ab709be

linux-user/syscall.c

+3 −3
Original line number Diff line number Diff line
@@ -7743,12 +7743,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
            if (gidsetsize == 0)

                break;

            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)

                    goto efault;

                for(i = 0;i < ret; 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;
@@ -7760,7 +7760,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, 
            int i;

            if (gidsetsize) {

                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) {

                    ret = -TARGET_EFAULT;

                    goto fail;