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

Commit 7125764c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull compat time conversion changes from Peter Anvin:
 "Despite the branch name this is really neither an x86 nor an
  x32-specific patchset, although it the implementation of the
  discussions that followed the x32 security hole a few months ago.

  This removes get/put_compat_timespec/val() and replaces them with
  compat_get/put_timespec/val() which are savvy as to the current status
  of COMPAT_USE_64BIT_TIME.

  It removes several unused and/or incorrect/misleading functions (like
  compat_put_timeval_convert which doesn't in fact do any conversion)
  and also replaces several open-coded implementations what is now
  called compat_convert_timespec() with that function"

* 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  compat: Fix sparse address space warnings
  compat: Get rid of (get|put)_compat_time(val|spec)
parents c6f21243 dce44e03

drivers/media/v4l2-core/v4l2-compat-ioctl32.c

+1 −1
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ static int put_v4l2_event32(struct v4l2_event *kp, struct v4l2_event32 __user *u 
		copy_to_user(&up->u, &kp->u, sizeof(kp->u)) ||

		put_user(kp->pending, &up->pending) ||

		put_user(kp->sequence, &up->sequence) ||

		put_compat_timespec(&kp->timestamp, &up->timestamp) ||

		compat_put_timespec(&kp->timestamp, &up->timestamp) ||

		put_user(kp->id, &up->id) ||

		copy_to_user(up->reserved, kp->reserved, 8 * sizeof(__u32)))

			return -EFAULT;

fs/compat.c

+3 −3
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filena 
	struct timespec tv[2];



	if  (t) {

		if (get_compat_timespec(&tv[0], &t[0]) ||

		    get_compat_timespec(&tv[1], &t[1]))

		if (compat_get_timespec(&tv[0], &t[0]) ||

		    compat_get_timespec(&tv[1], &t[1]))

			return -EFAULT;



		if (tv[0].tv_nsec == UTIME_OMIT && tv[1].tv_nsec == UTIME_OMIT)
@@ -505,7 +505,7 @@ COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id, 
	struct timespec __user *ut = NULL;



	if (timeout) {

		if (get_compat_timespec(&t, timeout))

		if (compat_get_timespec(&t, timeout))

			return -EFAULT;



		ut = compat_alloc_user_space(sizeof(*ut));

include/linux/compat.h

+10 −13
Original line number Diff line number Diff line
@@ -146,27 +146,24 @@ struct compat_sigaction { 
	compat_sigset_t			sa_mask __packed;

};



/*

 * These functions operate strictly on struct compat_time*

 */

extern int get_compat_timespec(struct timespec *,

			       const struct compat_timespec __user *);

extern int put_compat_timespec(const struct timespec *,

			       struct compat_timespec __user *);

extern int get_compat_timeval(struct timeval *,

			      const struct compat_timeval __user *);

extern int put_compat_timeval(const struct timeval *,

			      struct compat_timeval __user *);

/*

 * These functions operate on 32- or 64-bit specs depending on

 * COMPAT_USE_64BIT_TIME, hence the void user pointer arguments and the

 * naming as compat_get/put_ rather than get/put_compat_.

 * COMPAT_USE_64BIT_TIME, hence the void user pointer arguments.

 */

extern int compat_get_timespec(struct timespec *, const void __user *);

extern int compat_put_timespec(const struct timespec *, void __user *);

extern int compat_get_timeval(struct timeval *, const void __user *);

extern int compat_put_timeval(const struct timeval *, void __user *);



/*

 * This function convert a timespec if necessary and returns a *user

 * space* pointer.  If no conversion is necessary, it returns the

 * initial pointer.  NULL is a legitimate argument and will always

 * output NULL.

 */

extern int compat_convert_timespec(struct timespec __user **,

				   const void __user *);



struct compat_iovec {

	compat_uptr_t	iov_base;

	compat_size_t	iov_len;

ipc/compat.c

+3 −9
Original line number Diff line number Diff line
@@ -753,14 +753,8 @@ 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) {

		struct timespec ts;

		ts64 = compat_alloc_user_space(sizeof(*ts64));

		if (get_compat_timespec(&ts, timeout))

	struct timespec __user *ts64;

	if (compat_convert_timespec(&ts64, timeout))

		return -EFAULT;

		if (copy_to_user(ts64, &ts, sizeof(ts)))

			return -EFAULT;

	}

	return sys_semtimedop(semid, tsems, nsops, ts64);

}

ipc/compat_mq.c

+3 −16
Original line number Diff line number Diff line
@@ -64,20 +64,6 @@ COMPAT_SYSCALL_DEFINE4(mq_open, const char __user *, u_name, 
	return sys_mq_open(u_name, oflag, mode, p);

}



static int compat_prepare_timeout(struct timespec __user **p,

				  const struct compat_timespec __user *u)

{

	struct timespec ts;

	if (!u) {

		*p = NULL;

		return 0;

	}

	*p = compat_alloc_user_space(sizeof(ts));

	if (get_compat_timespec(&ts, u) || copy_to_user(*p, &ts, sizeof(ts)))

		return -EFAULT;

	return 0;

}



COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes,

		       const char __user *, u_msg_ptr,

		       compat_size_t, msg_len, unsigned int, msg_prio,
@@ -85,7 +71,7 @@ COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes, 
{

	struct timespec __user *u_ts;



	if (compat_prepare_timeout(&u_ts, u_abs_timeout))

	if (compat_convert_timespec(&u_ts, u_abs_timeout))

		return -EFAULT;



	return sys_mq_timedsend(mqdes, u_msg_ptr, msg_len,
@@ -98,7 +84,8 @@ COMPAT_SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, 
		       const struct compat_timespec __user *, u_abs_timeout)

{

	struct timespec __user *u_ts;

	if (compat_prepare_timeout(&u_ts, u_abs_timeout))



	if (compat_convert_timespec(&u_ts, u_abs_timeout))

		return -EFAULT;



	return sys_mq_timedreceive(mqdes, u_msg_ptr, msg_len,