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

Commit f3926e4c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull misc uaccess fixes from Al Viro:
 "Fix for unsafe_put_user() (no callers currently in mainline, but
  anyone starting to use it will step into that) + alpha osf_wait4()
  infoleak fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  osf_wait4(): fix infoleak
  fix unsafe_put_user()
parents 970c305a a8c39544

arch/alpha/kernel/osf_sys.c

+4 −2
Original line number Diff line number Diff line
@@ -1201,8 +1201,10 @@ SYSCALL_DEFINE4(osf_wait4, pid_t, pid, int __user *, ustatus, int, options, 
	if (!access_ok(VERIFY_WRITE, ur, sizeof(*ur)))

		return -EFAULT;



	err = 0;

	err |= put_user(status, ustatus);

	err = put_user(status, ustatus);

	if (ret < 0)

		return err ? err : ret;



	err |= __put_user(r.ru_utime.tv_sec, &ur->ru_utime.tv_sec);

	err |= __put_user(r.ru_utime.tv_usec, &ur->ru_utime.tv_usec);

	err |= __put_user(r.ru_stime.tv_sec, &ur->ru_stime.tv_sec);

arch/x86/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ extern struct movsl_mask { 
#define unsafe_put_user(x, ptr, err_label)					\

do {										\

	int __pu_err;								\

	__put_user_size((x), (ptr), sizeof(*(ptr)), __pu_err, -EFAULT);		\

	__put_user_size((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)), __pu_err, -EFAULT);		\

	if (unlikely(__pu_err)) goto err_label;					\

} while (0)