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

Commit 88b4ad28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus-v4.8-rc7' of... 

Merge tag 'fixes-for-linus-v4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull uaccess fixes from Guenter Roeck:
 "Two patches fixing problems introduced with copy_from_user changes"

* tag 'fixes-for-linus-v4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  openrisc: fix the fix of copy_from_user()
  avr32: fix 'undefined reference to `___copy_from_user'
parents 3286be94 8e4b7205

arch/avr32/lib/copy_user.S

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 
	 */

	.text

	.align	1

	.global	copy_from_user

	.type	copy_from_user, @function

	.global	___copy_from_user

	.type	___copy_from_user, @function

___copy_from_user:

	branch_if_kernel r8, __copy_user

	ret_if_privileged r8, r11, r10, r10

arch/openrisc/include/asm/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ copy_from_user(void *to, const void *from, unsigned long n) 
	unsigned long res = n;



	if (likely(access_ok(VERIFY_READ, from, n)))

		n = __copy_tofrom_user(to, from, n);

		res = __copy_tofrom_user(to, from, n);

	if (unlikely(res))

		memset(to + (n - res), 0, res);

	return res;