From 948ce73b31fdb0860bcec4b8e62b14e88234f98a Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 27 Jan 2022 16:45:18 -0300 Subject: Linux: Only generate 64 bit timestamps for 64 bit time_t recvmsg/recvmmsg The timestamps created by __convert_scm_timestamps only make sense for 64 bit time_t programs, 32 bit time_t programs will ignore 64 bit time_t timestamps since SO_TIMESTAMP will be defined to old values (either by glibc or kernel headers). Worse, if the buffer is not suffice MSG_CTRUNC is set to indicate it (which breaks some programs [1]). This patch makes only 64 bit time_t recvmsg and recvmmsg to call __convert_scm_timestamps. Also, the assumption to called it is changed from __ASSUME_TIME64_SYSCALLS to __TIMESIZE != 64 since the setsockopt might be called by libraries built without __TIME_BITS=64. The MSG_CTRUNC is only set for the 64 bit symbols, it should happen only if 64 bit time_t programs run older kernels. Checked on x86_64-linux-gnu and i686-linux-gnu. [1] https://github.com/systemd/systemd/pull/20567 Reviewed-by: Florian Weimer --- sysdeps/unix/sysv/linux/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/Makefile') diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 4c80ff809c..7122f55975 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -277,8 +277,14 @@ sysdep_routines += cmsg_nxthdr CFLAGS-recvmmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sendmmsg.c = -fexceptions -fasynchronous-unwind-tables -tests += tst-socket-timestamp -tests-time64 += tst-socket-timestamp-time64 +tests += \ + tst-socket-timestamp \ + tst-socket-timestamp-compat \ + # tests +tests-time64 += \ + tst-socket-timestamp-time64 \ + tst-socket-timestamp-compat-time64 + # tests-time64 tests-special += $(objpfx)tst-socket-consts.out $(objpfx)tst-socket-consts.out: ../sysdeps/unix/sysv/linux/tst-socket-consts.py -- cgit 1.4.1