From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QC47R-0006yN-Ps for qemu-devel@nongnu.org; Tue, 19 Apr 2011 02:09:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QC47Q-0000G9-Ru for qemu-devel@nongnu.org; Tue, 19 Apr 2011 02:09:01 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:45837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QC47Q-0000G3-IS for qemu-devel@nongnu.org; Tue, 19 Apr 2011 02:09:00 -0400 Received: from epmmp2 (mailout1.samsung.com [203.254.224.24]) by mailout1.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LJV00GXFYENOAE0@mailout1.samsung.com> for qemu-devel@nongnu.org; Tue, 19 Apr 2011 15:08:47 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LJV00AI7YEO9B@mmp2.samsung.com> for qemu-devel@nongnu.org; Tue, 19 Apr 2011 15:08:48 +0900 (KST) Date: Tue, 19 Apr 2011 15:09:52 +0900 From: Mike McCormack Message-id: <4DAD2730.5050803@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7BIT Subject: [Qemu-devel] [PATCH 2/2] Don't zero out buffer in sched_getaffinity List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: riku.voipio@iki.fi Cc: Rafal Krypa , vapier@gentoo.org, qemu-devel@nongnu.org, stefanha@linux.vnet.ibm.com The kernel doesn't fill the buffer provided to sched_getaffinity with zero bytes, so neither should QEMU. Signed-off-by: Mike McCormack Reviewed-by: Stefan Hajnoczi --- linux-user/syscall.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1cda10a..e53b7e5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6384,20 +6384,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret = get_errno(sys_sched_getaffinity(arg1, mask_size, mask)); if (!is_error(ret)) { - if (arg2 > ret) { - /* Zero out any extra space kernel didn't fill */ - unsigned long zero = arg2 - ret; - p = alloca(zero); - memset(p, 0, zero); - if (copy_to_user(arg3 + ret, p, zero)) { - goto efault; - } - arg2 = ret; - } - if (copy_to_user(arg3, mask, arg2)) { + if (copy_to_user(arg3, mask, ret)) { goto efault; } - ret = arg2; } } break; -- 1.7.0.4