aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/socket.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-04-18 07:42:25 -0400
committerArnd Bergmann <arnd@arndb.de>2018-08-29 09:42:24 -0400
commitc2e6c8567acdba8db1055b242c34ceb123c6a253 (patch)
treec68fc623710d64f681bcd1b90965f69a757e64ba /include/linux/socket.h
parent474b9c777b20b8340a6ee0f7ba6ebbd6a4bf47e2 (diff)
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 'include/linux/socket.h')
-rw-r--r--include/linux/socket.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 7ed4713d5337..8b571e9b9f76 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -348,7 +348,7 @@ struct ucred {
348extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr); 348extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr);
349extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); 349extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
350 350
351struct timespec; 351struct timespec64;
352 352
353/* The __sys_...msg variants allow MSG_CMSG_COMPAT iff 353/* The __sys_...msg variants allow MSG_CMSG_COMPAT iff
354 * forbid_cmsg_compat==false 354 * forbid_cmsg_compat==false
@@ -358,7 +358,7 @@ extern long __sys_recvmsg(int fd, struct user_msghdr __user *msg,
358extern long __sys_sendmsg(int fd, struct user_msghdr __user *msg, 358extern long __sys_sendmsg(int fd, struct user_msghdr __user *msg,
359 unsigned int flags, bool forbid_cmsg_compat); 359 unsigned int flags, bool forbid_cmsg_compat);
360extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen, 360extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
361 unsigned int flags, struct timespec *timeout); 361 unsigned int flags, struct timespec64 *timeout);
362extern int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg, 362extern int __sys_sendmmsg(int fd, struct mmsghdr __user *mmsg,
363 unsigned int vlen, unsigned int flags, 363 unsigned int vlen, unsigned int flags,
364 bool forbid_cmsg_compat); 364 bool forbid_cmsg_compat);