From 30cb4cdec79dc2727f562edee36a4f3df4dfc23f Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 25 Feb 2011 10:27:40 +0000 Subject: linux-user: Fix unlock_user() call in return from poll() Correct the broken attempt to calculate the third argument to unlock_user() in the code path which unlocked the pollfd array on return from poll() and ppoll() emulation. (This only caused a problem if unlock_user() wasn't a no-op, eg if DEBUG_REMAP is defined.) Signed-off-by: Peter Maydell Signed-off-by: Aurelien Jarno --- linux-user/syscall.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 23d7a63..bb0999d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6318,10 +6318,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, for(i = 0; i < nfds; i++) { target_pfd[i].revents = tswap16(pfd[i].revents); } - ret += nfds * (sizeof(struct target_pollfd) - - sizeof(struct pollfd)); } - unlock_user(target_pfd, arg1, ret); + unlock_user(target_pfd, arg1, sizeof(struct target_pollfd) * nfds); } break; #endif -- cgit v1.1