From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 83982382E825; Tue, 23 Feb 2021 12:36:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83982382E825 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Add recvvmsg fallback for 64-bit time_t SO_TIMESTAMP{NS} X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: d3a8ef25d843cd848a00069d45f8ae307511ea08 X-Git-Newrev: 57d7367ded8bba42138bfd3fddc1c52fce045aaa Message-Id: <20210223123638.83982382E825@sourceware.org> Date: Tue, 23 Feb 2021 12:36:38 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2021 12:36:38 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=57d7367ded8bba42138bfd3fddc1c52fce045aaa commit 57d7367ded8bba42138bfd3fddc1c52fce045aaa Author: Adhemerval Zanella Date: Tue Sep 8 09:08:10 2020 -0300 linux: Add recvvmsg fallback for 64-bit time_t SO_TIMESTAMP{NS} Handle the SO_TIMESTAMP{NS} similar to recvmsg: for !__ASSUME_TIME64_SYSCALLS it converts the first 32-bit time SO_TIMESTAMP or SO_TIMESTAMPNS and appends it to the control buffer if has extra space or returns MSG_CTRUNC otherwise. The 32-bit time field is kept as-is. Also for !__ASSUME_TIME64_SYSCALLS it limits the maximum number of 'struct mmsghdr *' to IOV_MAX (and also increases the stack size requirement to IOV_MAX times sizeof (socklen_t)). The Linux imposes a similar limit to sendmmsg, so bound the array size on recvmmsg is not unreasonable. And this will be used only on older when building with 32-bit time support. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Diff: --- include/sys/socket.h | 3 +++ sysdeps/unix/sysv/linux/recvmmsg.c | 17 +++++++++++++++-- sysdeps/unix/sysv/linux/recvmsg.c | 6 +++--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/include/sys/socket.h b/include/sys/socket.h index c551c8fa87..171440ab14 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -171,6 +171,9 @@ libc_hidden_proto (__libc_sa_len) #define SCM_TIMESTAMPNS_NEW SO_TIMESTAMPNS_NEW #define SCM_TIMESTAMPING_NEW SO_TIMESTAMPING_NEW +extern void __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) + attribute_hidden; + libc_hidden_proto (__cmsg_nxthdr) #endif diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c index 672ba20332..5cd107ffa9 100644 --- a/sysdeps/unix/sysv/linux/recvmmsg.c +++ b/sysdeps/unix/sysv/linux/recvmmsg.c @@ -44,13 +44,26 @@ __recvmmsg64 (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags, ts32 = valid_timespec64_to_timespec (*timeout); pts32 = &ts32; } + + socklen_t csize[IOV_MAX]; + if (vlen > IOV_MAX) + vlen = IOV_MAX; + for (int i = 0; i < vlen; i++) + csize[i] = vmessages[i].msg_hdr.msg_controllen; + # ifdef __ASSUME_RECVMMSG_SYSCALL r = SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, pts32); # else r = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, pts32); # endif - if (r >= 0 && timeout != NULL) - *timeout = valid_timespec_to_timespec64 (ts32); + if (r >= 0) + { + if (timeout != NULL) + *timeout = valid_timespec_to_timespec64 (ts32); + + for (int i=0; i < r; i++) + __convert_scm_timestamps (&vmessages[i].msg_hdr, csize[i]); + } #endif /* __ASSUME_TIME64_SYSCALLS */ return r; } diff --git a/sysdeps/unix/sysv/linux/recvmsg.c b/sysdeps/unix/sysv/linux/recvmsg.c index c01a9009c7..f802e85971 100644 --- a/sysdeps/unix/sysv/linux/recvmsg.c +++ b/sysdeps/unix/sysv/linux/recvmsg.c @@ -32,8 +32,8 @@ original message as a spurious control ones of unknown typ while running on kernel with native 64-bit time support will only see the time64 version of the control message. */ -static void -convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) +void +__convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) { if (msg->msg_control == NULL || msg->msg_controllen == 0) return; @@ -108,7 +108,7 @@ __libc_recvmsg (int fd, struct msghdr *msg, int flags) #ifndef __ASSUME_TIME64_SYSCALLS if (r >= 0) - convert_scm_timestamps (msg, orig_controllen); + __convert_scm_timestamps (msg, orig_controllen); #endif return r;