]> git.proxmox.com Git - qemu.git/commitdiff
Fix buffer overrun in sched_getaffinity
authorMike McCormack <mj.mccormack@samsung.com>
Tue, 12 Apr 2011 02:41:00 +0000 (11:41 +0900)
committerRiku Voipio <riku.voipio@iki.fi>
Mon, 2 May 2011 07:00:01 +0000 (10:00 +0300)
Zeroing of the cpu array should start from &cpus[kernel_ret]
not &cpus[num_zeros_to_fill].

This fixes a crash in EFL's edje_cc running under qemu-arm.

Signed-off-by: Mike McCormack <mj.mccormack@samsung.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
linux-user/syscall.c

index e969d1b61d5db94c1a1a6a6504a64d891040bfc8..5b7b8e239472ef807a38257045412c209990b2d5 100644 (file)
@@ -6505,7 +6505,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
                     unsigned long zero = arg2 - ret;
                     p = alloca(zero);
                     memset(p, 0, zero);
-                    if (copy_to_user(arg3 + zero, p, zero)) {
+                    if (copy_to_user(arg3 + ret, p, zero)) {
                         goto efault;
                     }
                     arg2 = ret;