From patchwork Fri Apr 19 13:59:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 237966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E4DFA2C021C for ; Sat, 20 Apr 2013 00:04:00 +1000 (EST) Received: from localhost ([::1]:35227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBux-00042d-59 for incoming@patchwork.ozlabs.org; Fri, 19 Apr 2013 10:03:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBrD-0007U5-6S for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:00:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTBr7-00034d-37 for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:00:07 -0400 Received: from afflict.kos.to ([92.243.29.197]:51614) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBr6-00033t-Rf for qemu-devel@nongnu.org; Fri, 19 Apr 2013 10:00:00 -0400 Received: from kos.to (a91-156-57-234.elisa-laajakaista.fi [91.156.57.234]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 6C27F26546 for ; Fri, 19 Apr 2013 15:59:58 +0200 (CEST) Received: from voipio (uid 1000) (envelope-from voipio@kos.to) id 5e011c by kos.to (DragonFly Mail Agent); Fri, 19 Apr 2013 16:59:57 +0300 From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 19 Apr 2013 16:59:56 +0300 Message-Id: <03903ffcfb5a7c75e52da97d00eb9d0bb0660f28.1366377671.git.riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: Andreas Schwab Subject: [Qemu-devel] [PATCH 3/3] linux-user: fix setgroups/getgroups for non-UID16 archs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andreas Schwab Don't assume target_id is a short. Signed-off-by: Andreas Schwab Signed-off-by: Riku Voipio --- linux-user/syscall.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5a786f2..c705960 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -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;