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

Commit 5d70a596 authored by Heiko Carstens's avatar Heiko Carstens
Browse files

ipc/compat: convert to COMPAT_SYSCALL_DEFINE 



Convert all compat system call functions where all parameter types
have a size of four or less than four bytes, or are pointer types
to COMPAT_SYSCALL_DEFINE.
The implicit casts within COMPAT_SYSCALL_DEFINE will perform proper
zero and sign extension to 64 bit of all parameters if needed.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 625b1d7e

ipc/compat.c

+5 −4
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static inline int put_compat_msqid_ds(struct msqid64_ds *m, 
	return err;

}



long compat_sys_msgctl(int first, int second, void __user *uptr)

COMPAT_SYSCALL_DEFINE3(msgctl, int, first, int, second, void __user *, uptr)

{

	int err, err2;

	struct msqid64_ds m64;
@@ -668,7 +668,7 @@ static inline int put_compat_shm_info(struct shm_info __user *ip, 
	return err;

}



long compat_sys_shmctl(int first, int second, void __user *uptr)

COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)

{

	void __user *p;

	struct shmid64_ds s64;
@@ -749,8 +749,9 @@ long compat_sys_shmctl(int first, int second, void __user *uptr) 
	return err;

}



long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,

		unsigned nsops, const struct compat_timespec __user *timeout)

COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,

		       unsigned, nsops,

		       const struct compat_timespec __user *, timeout)

{

	struct timespec __user *ts64 = NULL;

	if (timeout) {

ipc/compat_mq.c

+8 −8
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ static inline int put_compat_mq_attr(const struct mq_attr *attr, 
		| __put_user(attr->mq_curmsgs, &uattr->mq_curmsgs);

}



asmlinkage long compat_sys_mq_open(const char __user *u_name,

			int oflag, compat_mode_t mode,

			struct compat_mq_attr __user *u_attr)

COMPAT_SYSCALL_DEFINE4(mq_open, const char __user *, u_name,

		       int, oflag, compat_mode_t, mode,

		       struct compat_mq_attr __user *, u_attr)

{

	void __user *p = NULL;

	if (u_attr && oflag & O_CREAT) {
@@ -105,8 +105,8 @@ asmlinkage ssize_t compat_sys_mq_timedreceive(mqd_t mqdes, 
			u_msg_prio, u_ts);

}



asmlinkage long compat_sys_mq_notify(mqd_t mqdes,

			const struct compat_sigevent __user *u_notification)

COMPAT_SYSCALL_DEFINE2(mq_notify, mqd_t, mqdes,

		       const struct compat_sigevent __user *, u_notification)

{

	struct sigevent __user *p = NULL;

	if (u_notification) {
@@ -122,9 +122,9 @@ asmlinkage long compat_sys_mq_notify(mqd_t mqdes, 
	return sys_mq_notify(mqdes, p);

}



asmlinkage long compat_sys_mq_getsetattr(mqd_t mqdes,

			const struct compat_mq_attr __user *u_mqstat,

			struct compat_mq_attr __user *u_omqstat)

COMPAT_SYSCALL_DEFINE3(mq_getsetattr, mqd_t, mqdes,

		       const struct compat_mq_attr __user *, u_mqstat,

		       struct compat_mq_attr __user *, u_omqstat)

{

	struct mq_attr mqstat;

	struct mq_attr __user *p = compat_alloc_user_space(2 * sizeof(*p));