diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2011-02-25 10:27:40 +0000 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-22 07:46:21 +0100 |
| commit | 30cb4cdec79dc2727f562edee36a4f3df4dfc23f (patch) | |
| tree | 24e9f3d2f7a9e663a094408ffbb7a5a2b83434c8 /linux-user/syscall.c | |
| parent | ff90d50393e4485e336ec57e157eee0f5d116d91 (diff) | |
| download | focaccia-qemu-30cb4cdec79dc2727f562edee36a4f3df4dfc23f.tar.gz focaccia-qemu-30cb4cdec79dc2727f562edee36a4f3df4dfc23f.zip | |
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 <peter.maydell@linaro.org> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 23d7a630f5..bb0999d1ab 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 |