compat time conversion changes for v3.15
Subsystems (2)
Hi Linus,
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.
The following changes since commit 5cb480f6b488128140c940abff3c36f524a334a8:
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild (2014-02-01 11:03:16 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-x32-for-linus
for you to fetch changes up to dce44e03b0a3448ad11ac6c6e0cbe299e0400791:
compat: Fix sparse address space warnings (2014-02-02 18:00:29 -0800)
----------------------------------------------------------------
H. Peter Anvin (2):
compat: Get rid of (get|put)_compat_time(val|spec)
compat: Fix sparse address space warnings
drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 2 +- fs/compat.c | 6 +- include/linux/compat.h | 23 +++--- ipc/compat.c | 12 +-- ipc/compat_mq.c | 19 +---- kernel/compat.c | 112 +++++++++++++------------- kernel/futex_compat.c | 2 +- 7 files changed, 77 insertions(+), 99 deletions(-)
drivers/media/v4l2-core/v4l2-compat-ioctl32.c +1 -1
@@ -733,7 +733,7 @@ static int put_v4l2_event32(struct v4l2_event *kp, struct v4l2_event32 __user *ucopy_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
@@ -92,8 +92,8 @@ asmlinkage long compat_sys_utimensat(unsigned int dfd, const char __user *filenastruct 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 )
@@ -512,7 +512,7 @@ compat_sys_io_getevents(aio_context_t ctx_id, nr * sizeof(struct io_event)))) goto out;if (timeout) { -if (get_compat_timespec (&t, timeout)) +if (compat_get_timespec (&t, timeout)) goto out; ut =compat_alloc_user_space (sizeof (*ut));
include/linux/compat.h +10 -13
@@ -141,26 +141,23 @@ struct compat_sigaction { };/* -* 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
@@ -752,14 +752,8 @@ long compat_sys_shmctl(int first, int second, void __user *uptr)long compat_sys_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)) -return -EFAULT ; -if (copy_to_user (ts64, &ts,sizeof (ts))) -return -EFAULT ; - } +struct timespec __user *ts64; +if (compat_convert_timespec (&ts64, timeout)) +return -EFAULT ;return sys_semtimedop (semid, tsems, nsops, ts64); }
ipc/compat_mq.c +3 -16
@@ -64,20 +64,6 @@ asmlinkage long compat_sys_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 ; -} - asmlinkage long compat_sys_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr, size_t msg_len, unsigned int msg_prio,
@@ -85,7 +71,7 @@ asmlinkage long compat_sys_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 @@ asmlinkage ssize_t compat_sys_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,
kernel/compat.c +56 -56
274 lines not on this page · raw message
kernel/futex_compat.c +1 -1
@@ -183,7 +183,7 @@ COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,if (utime && (cmd ==FUTEX_WAIT || cmd ==FUTEX_LOCK_PI || cmd ==FUTEX_WAIT_BITSET || cmd ==FUTEX_WAIT_REQUEUE_PI )) { -if (get_compat_timespec (&ts, utime)) +if (compat_get_timespec (&ts, utime))return -EFAULT ;if (!timespec_valid (&ts))return -EINVAL ;