From cd18f05e248bb916028021634058da06a4657e26 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Mon, 18 Apr 2011 14:43:36 +0900 Subject: Don't zero out buffer in sched_getaffinity 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 Signed-off-by: Riku Voipio --- linux-user/syscall.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'linux-user') diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 5b7b8e2394..279cef3cd4 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6500,20 +6500,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; -- cgit v1.2.1