diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-09-07 17:08:46 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2021-06-15 10:42:06 -0300 |
commit | 13c51549e2077f2f3bf84e8fd0b46d8b0c615912 (patch) | |
tree | b62046c46909d85fcd8a4cf815da4cf3c94ab337 /sysdeps/unix/sysv/linux/setsockopt.c | |
parent | 8dfb169c80b56cf25494d052ddf410dc55f2f5a3 (diff) | |
download | glibc-13c51549e2077f2f3bf84e8fd0b46d8b0c615912.tar.gz glibc-13c51549e2077f2f3bf84e8fd0b46d8b0c615912.tar.xz glibc-13c51549e2077f2f3bf84e8fd0b46d8b0c615912.zip |
linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS}
The recvmsg handling is more complicated because it requires check the returned kernel control message and make some convertions. 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. Calls with __TIMESIZE=32 will see the converted 64-bit time control messages as spurious control message of unknown type. Calls with __TIMESIZE=64 running on pre-time64 kernels will see the 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. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/setsockopt.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/setsockopt.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/setsockopt.c b/sysdeps/unix/sysv/linux/setsockopt.c index 6505202265..a4780a9d33 100644 --- a/sysdeps/unix/sysv/linux/setsockopt.c +++ b/sysdeps/unix/sysv/linux/setsockopt.c @@ -69,6 +69,18 @@ setsockopt32 (int fd, int level, int optname, const void *optval, r = setsockopt_syscall (fd, level, optname, &tv32, sizeof (tv32)); } + break; + + case COMPAT_SO_TIMESTAMP_NEW: + case COMPAT_SO_TIMESTAMPNS_NEW: + { + if (optname == COMPAT_SO_TIMESTAMP_NEW) + optname = COMPAT_SO_TIMESTAMP_OLD; + if (optname == COMPAT_SO_TIMESTAMPNS_NEW) + optname = COMPAT_SO_TIMESTAMPNS_OLD; + r = setsockopt_syscall (fd, level, optname, NULL, 0); + } + break; } return r; |