lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS}

Browse Source 
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>
This commit is contained in:
Adhemerval Zanella
2020-09-07 17:08:46 -03:00
parent 8dfb169c80
commit 13c51549e2
11 changed files with 167 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sysdeps/unix/sysv/linux/getsockopt.c
View File

@ -70,6 +70,18 @@ getsockopt32 (int fd, int level, int optname, void *optval,
else
memcpy (optval, &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 = getsockopt_syscall (fd, level, optname, optval, len);
}
break;
}
return r;