Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21fc538d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

y2038: ipc: Use __kernel_timespec 



This is a preparatation for changing over __kernel_timespec to 64-bit
times, which involves assigning new system call numbers for mq_timedsend(),
mq_timedreceive() and semtimedop() for compatibility with future y2038
proof user space.

The existing ABIs will remain available through compat code.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent c2ab975c

include/linux/syscalls.h

+3 −3
Original line number Diff line number Diff line
@@ -680,8 +680,8 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info); 
/* ipc/mqueue.c */

asmlinkage long sys_mq_open(const char __user *name, int oflag, umode_t mode, struct mq_attr __user *attr);

asmlinkage long sys_mq_unlink(const char __user *name);

asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *msg_ptr, size_t msg_len, unsigned int msg_prio, const struct timespec __user *abs_timeout);

asmlinkage long sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, size_t msg_len, unsigned int __user *msg_prio, const struct timespec __user *abs_timeout);

asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *msg_ptr, size_t msg_len, unsigned int msg_prio, const struct __kernel_timespec __user *abs_timeout);

asmlinkage long sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, size_t msg_len, unsigned int __user *msg_prio, const struct __kernel_timespec __user *abs_timeout);

asmlinkage long sys_mq_notify(mqd_t mqdes, const struct sigevent __user *notification);

asmlinkage long sys_mq_getsetattr(mqd_t mqdes, const struct mq_attr __user *mqstat, struct mq_attr __user *omqstat);
@@ -698,7 +698,7 @@ asmlinkage long sys_semget(key_t key, int nsems, int semflg); 
asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);

asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,

				unsigned nsops,

				const struct timespec __user *timeout);

				const struct __kernel_timespec __user *timeout);

asmlinkage long sys_semop(int semid, struct sembuf __user *sops,

				unsigned nsops);

ipc/mqueue.c

+3 −3
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ static void __do_notify(struct mqueue_inode_info *info) 
	wake_up(&info->wait_q);

}



static int prepare_timeout(const struct timespec __user *u_abs_timeout,

static int prepare_timeout(const struct __kernel_timespec __user *u_abs_timeout,

			   struct timespec64 *ts)

{

	if (get_timespec64(ts, u_abs_timeout))
@@ -1128,7 +1128,7 @@ static int do_mq_timedreceive(mqd_t mqdes, char __user *u_msg_ptr, 


SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr,

		size_t, msg_len, unsigned int, msg_prio,

		const struct timespec __user *, u_abs_timeout)

		const struct __kernel_timespec __user *, u_abs_timeout)

{

	struct timespec64 ts, *p = NULL;

	if (u_abs_timeout) {
@@ -1142,7 +1142,7 @@ SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, const char __user *, u_msg_ptr, 


SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,

		size_t, msg_len, unsigned int __user *, u_msg_prio,

		const struct timespec __user *, u_abs_timeout)

		const struct __kernel_timespec __user *, u_abs_timeout)

{

	struct timespec64 ts, *p = NULL;

	if (u_abs_timeout) {

ipc/sem.c

+2 −2
Original line number Diff line number Diff line
@@ -2176,7 +2176,7 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops, 
}



long ksys_semtimedop(int semid, struct sembuf __user *tsops,

		     unsigned int nsops, const struct timespec __user *timeout)

		     unsigned int nsops, const struct __kernel_timespec __user *timeout)

{

	if (timeout) {

		struct timespec64 ts;
@@ -2188,7 +2188,7 @@ long ksys_semtimedop(int semid, struct sembuf __user *tsops, 
}



SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,

		unsigned int, nsops, const struct timespec __user *, timeout)

		unsigned int, nsops, const struct __kernel_timespec __user *, timeout)

{

	return ksys_semtimedop(semid, tsops, nsops, timeout);

}

ipc/util.h

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static inline int compat_ipc_parse_version(int *cmd) 
/* for __ARCH_WANT_SYS_IPC */

long ksys_semtimedop(int semid, struct sembuf __user *tsops,

		     unsigned int nsops,

		     const struct timespec __user *timeout);

		     const struct __kernel_timespec __user *timeout);

long ksys_semget(key_t key, int nsems, int semflg);

long ksys_semctl(int semid, int semnum, int cmd, unsigned long arg);

long ksys_msgget(key_t key, int msgflg);