epoll_pwait2 is the same as epoll_pwait but with timeout being
(a pointer to) struct timespec instead of an integer.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3210
Signed-off-by: Michael Tokarev <[email protected]>
---
linux-user/syscall.c | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index d89c36382e..8f41cdb94b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -708,8 +708,11 @@ safe_syscall5(int, ppoll, struct pollfd *, ufds, unsigned
int, nfds,
size_t, sigsetsize)
#endif
safe_syscall6(int, epoll_pwait, int, epfd, struct epoll_event *, events,
- int, maxevents, int, timeout, const sigset_t *, sigmask,
- size_t, sigsetsize)
+ int, maxevents, int, timeout,
+ const sigset_t *, sigmask, size_t, sigsetsize)
+safe_syscall6(int, epoll_pwait2, int, epfd, struct epoll_event *, events,
+ int, maxevents, struct timespec *, timeout_ts,
+ const sigset_t *, sigmask, size_t, sigsetsize)
#if defined(__NR_futex)
safe_syscall6(int,futex,int *,uaddr,int,op,int,val, \
const struct timespec *,timeout,int *,uaddr2,int,val3)
@@ -13619,12 +13622,20 @@ static abi_long do_syscall1(CPUArchState *cpu_env,
int num, abi_long arg1,
case TARGET_NR_epoll_wait:
#endif
case TARGET_NR_epoll_pwait:
+ case TARGET_NR_epoll_pwait2:
{
struct target_epoll_event *target_ep;
struct epoll_event *ep;
int epfd = arg1;
int maxevents = arg3;
- int timeout = arg4;
+ struct timespec ts, *timeout_ts = NULL;
+
+ if (num == TARGET_NR_epoll_pwait2 && arg4 != 0) {
+ if (target_to_host_timespec(&ts, arg4)) {
+ return -TARGET_EFAULT;
+ }
+ timeout_ts = &ts;
+ }
if (maxevents <= 0 || maxevents > TARGET_EP_MAX_EVENTS) {
return -TARGET_EINVAL;
@@ -13644,6 +13655,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int
num, abi_long arg1,
switch (num) {
case TARGET_NR_epoll_pwait:
+ case TARGET_NR_epoll_pwait2:
{
sigset_t *set = NULL;
@@ -13654,8 +13666,13 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
}
}
- ret = get_errno(safe_epoll_pwait(epfd, ep, maxevents, timeout,
- set, SIGSET_T_SIZE));
+ if (num == TARGET_NR_epoll_pwait) {
+ ret = get_errno(safe_epoll_pwait(epfd, ep, maxevents, arg4,
+ set, SIGSET_T_SIZE));
+ } else {
+ ret = get_errno(safe_epoll_pwait2(epfd, ep, maxevents,
timeout_ts,
+ set, SIGSET_T_SIZE));
+ }
