diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-18 20:36:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-18 20:36:15 -0500 |
| commit | b92ce305fcbc8d85d1732fecf17c823c760868bd (patch) | |
| tree | 088abc053568c724787c94e035c75453dfa445c9 /arch/arm/lib/getuser.S | |
| parent | 17a984bccde4c9ea34d78de1535760a25ad87993 (diff) | |
| parent | 9e3440481845b2ec22508f60837ee2cab2b6054f (diff) | |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A couple of fixes from Kees concerning problems he spotted with our
user access support"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8658/1: uaccess: fix zeroing of 64-bit get_user()
ARM: 8657/1: uaccess: consistently check object sizes
Diffstat (limited to 'arch/arm/lib/getuser.S')
| -rw-r--r-- | arch/arm/lib/getuser.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 8ecfd15c3a02..df73914e81c8 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S | |||
| @@ -67,7 +67,7 @@ ENTRY(__get_user_4) | |||
| 67 | ENDPROC(__get_user_4) | 67 | ENDPROC(__get_user_4) |
| 68 | 68 | ||
| 69 | ENTRY(__get_user_8) | 69 | ENTRY(__get_user_8) |
| 70 | check_uaccess r0, 8, r1, r2, __get_user_bad | 70 | check_uaccess r0, 8, r1, r2, __get_user_bad8 |
| 71 | #ifdef CONFIG_THUMB2_KERNEL | 71 | #ifdef CONFIG_THUMB2_KERNEL |
| 72 | 5: TUSER(ldr) r2, [r0] | 72 | 5: TUSER(ldr) r2, [r0] |
| 73 | 6: TUSER(ldr) r3, [r0, #4] | 73 | 6: TUSER(ldr) r3, [r0, #4] |