tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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'

Linus Torvalds 88b4ad28 3286be94

options
unified split
Changed files
+3 -3
arch
avr32
lib
copy_user.S
openrisc
include
asm
uaccess.h
+2 -2
arch/avr32/lib/copy_user.S
··· 23 23 */ 24 24 .text 25 25 .align 1 26 - .global copy_from_user 27 - .type copy_from_user, @function 26 + .global ___copy_from_user 27 + .type ___copy_from_user, @function 28 28 ___copy_from_user: 29 29 branch_if_kernel r8, __copy_user 30 30 ret_if_privileged r8, r11, r10, r10
+1 -1
arch/openrisc/include/asm/uaccess.h
··· 276 276 unsigned long res = n; 277 277 278 278 if (likely(access_ok(VERIFY_READ, from, n))) 279 - n = __copy_tofrom_user(to, from, n); 279 + res = __copy_tofrom_user(to, from, n); 280 280 if (unlikely(res)) 281 281 memset(to + (n - res), 0, res); 282 282 return res;