From 37d6d09ec66d7d571031674586869e9162c13fb1 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 7 Aug 2019 21:28:37 -0400 Subject: [PATCH] fix regression in recvmmsg with no timeout somewhat analogous to commit d0b547dfb5f7678cab6bc39dd736ed6454357ca4, but here the omission of the null timeout check was in the time64 syscall code path. this code is not yet used except on x32. --- src/network/recvmmsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/recvmmsg.c b/src/network/recvmmsg.c index 1dc67932..d5dc6b51 100644 --- a/src/network/recvmmsg.c +++ b/src/network/recvmmsg.c @@ -22,7 +22,7 @@ int recvmmsg(int fd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int fla int r = -ENOSYS; if (SYS_recvmmsg == SYS_recvmmsg_time64 || !IS32BIT(s)) r = __syscall_cp(SYS_recvmmsg_time64, fd, msgvec, vlen, flags, - ((long long[]){s, ns})); + timeout ? ((long long[]){s, ns}) : 0); if (SYS_recvmmsg == SYS_recvmmsg_time64 || r!=-ENOSYS) return __syscall_ret(r); return syscall_cp(SYS_recvmmsg, fd, msgvec, vlen, flags, -- 2.11.4.GIT