OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Don't use alloca() for epoll_wait's epoll event array

Browse Source 
The epoll event array which epoll_wait() allocates has a size
determined by the guest which could potentially be quite large.
Use g_try_new() rather than alloca() so that we can fail more
cleanly if the guest hands us an oversize value. (ENOMEM is
not a documented return value for epoll_wait() but in practice
some kernel configurations can return it -- see for instance
sys_oabi_epoll_wait() on ARM.)

This rearrangement includes fixing a bug where we were
incorrectly passing a negative length to unlock_user() in
the error-exit codepath.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
This commit is contained in:
Peter Maydell 2016-07-18 15:36:00 +01:00 committed by Riku Voipio
parent 434f286bbc
commit 04c95f4da7
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
linux-user/syscall.c
View File

@ -11777,7 +11777,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
goto efault;
}
ep = alloca(maxevents * sizeof(struct epoll_event));
ep = g_try_new(struct epoll_event, maxevents);
if (!ep) {
unlock_user(target_ep, arg2, 0);
ret = -TARGET_ENOMEM;
break;
}
switch (num) {
#if defined(TARGET_NR_epoll_pwait)
@ -11795,8 +11800,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
target_set = lock_user(VERIFY_READ, arg5,
sizeof(target_sigset_t), 1);
if (!target_set) {
unlock_user(target_ep, arg2, 0);
goto efault;
ret = -TARGET_EFAULT;
break;
}
target_to_host_sigset(set, target_set);
unlock_user(target_set, arg5, 0);
@ -11824,8 +11829,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
target_ep[i].events = tswap32(ep[i].events);
target_ep[i].data.u64 = tswap64(ep[i].data.u64);
}
unlock_user(target_ep, arg2,
ret * sizeof(struct target_epoll_event));
} else {
unlock_user(target_ep, arg2, 0);
}
unlock_user(target_ep, arg2, ret * sizeof(struct target_epoll_event));
g_free(ep);
break;
}
#endif