diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-04-18 13:42:25 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-08-29 15:42:24 +0200 |
| commit | c2e6c8567acdba8db1055b242c34ceb123c6a253 (patch) | |
| tree | c68fc623710d64f681bcd1b90965f69a757e64ba /net/compat.c | |
| parent | y2038: sched: Change sched_rr_get_interval to use __kernel_timespec (diff) | |
| download | linux-dev-c2e6c8567acdba8db1055b242c34ceb123c6a253.tar.xz linux-dev-c2e6c8567acdba8db1055b242c34ceb123c6a253.zip | |
y2038: socket: Change recvmmsg to use __kernel_timespec
This converts the recvmmsg() system call in all its variations to use
'timespec64' internally for its timeout, and have a __kernel_timespec64
argument in the native entry point. This lets us change the type to use
64-bit time_t at a later point while using the 32-bit compat system call
emulation for existing user space.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/compat.c')
| -rw-r--r-- | net/compat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/compat.c b/net/compat.c index 2ef160876bc1..47a614b370cd 100644 --- a/net/compat.c +++ b/net/compat.c @@ -815,18 +815,18 @@ static int __compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg, struct old_timespec32 __user *timeout) { int datagrams; - struct timespec ktspec; + struct timespec64 ktspec; if (timeout == NULL) return __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, flags | MSG_CMSG_COMPAT, NULL); - if (compat_get_timespec(&ktspec, timeout)) + if (compat_get_timespec64(&ktspec, timeout)) return -EFAULT; datagrams = __sys_recvmmsg(fd, (struct mmsghdr __user *)mmsg, vlen, flags | MSG_CMSG_COMPAT, &ktspec); - if (datagrams > 0 && compat_put_timespec(&ktspec, timeout)) + if (datagrams > 0 && compat_put_timespec64(&ktspec, timeout)) datagrams = -EFAULT; return datagrams; |