diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 19:50:09 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-06 19:50:09 +0100 |
commit | 3fe26611bb4999c3717d3aface0bac722b9d2653 (patch) | |
tree | 4e2f65865f3096180b28c6bd8a366155a9d9a326 /arch/arm/lib/getuser.S | |
parent | fc480b9ec980f6751698db56922ef46d05436bd7 (diff) | |
parent | 10a8113dfbfaf19d69eca171b96e451f5221cc2b (diff) | |
download | kernel_samsung_smdk4412-3fe26611bb4999c3717d3aface0bac722b9d2653.zip kernel_samsung_smdk4412-3fe26611bb4999c3717d3aface0bac722b9d2653.tar.gz kernel_samsung_smdk4412-3fe26611bb4999c3717d3aface0bac722b9d2653.tar.bz2 |
Merge branch 'upstreaming' of fossencdi.org:kernel_samsung_smdk4412 into upstreaming
Diffstat (limited to 'arch/arm/lib/getuser.S')
-rw-r--r-- | arch/arm/lib/getuser.S | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S index 1b049cd..4306fbf 100644 --- a/arch/arm/lib/getuser.S +++ b/arch/arm/lib/getuser.S @@ -16,8 +16,9 @@ * __get_user_X * * Inputs: r0 contains the address + * r1 contains the address limit, which must be preserved * Outputs: r0 is the error code - * r2, r3 contains the zero-extended value + * r2 contains the zero-extended value * lr corrupted * * No other registers must be altered. (see <asm/uaccess.h> @@ -27,33 +28,39 @@ * Note also that it is intended that __get_user_bad is not global. */ #include <linux/linkage.h> +#include <asm/assembler.h> #include <asm/errno.h> #include <asm/domain.h> ENTRY(__get_user_1) + check_uaccess r0, 1, r1, r2, __get_user_bad 1: T(ldrb) r2, [r0] mov r0, #0 mov pc, lr ENDPROC(__get_user_1) ENTRY(__get_user_2) -#ifdef CONFIG_THUMB2_KERNEL -2: T(ldrb) r2, [r0] -3: T(ldrb) r3, [r0, #1] + check_uaccess r0, 2, r1, r2, __get_user_bad +#ifdef CONFIG_CPU_USE_DOMAINS +rb .req ip +2: ldrbt r2, [r0], #1 +3: ldrbt rb, [r0], #0 #else -2: T(ldrb) r2, [r0], #1 -3: T(ldrb) r3, [r0] +rb .req r0 +2: ldrb r2, [r0] +3: ldrb rb, [r0, #1] #endif #ifndef __ARMEB__ - orr r2, r2, r3, lsl #8 + orr r2, r2, rb, lsl #8 #else - orr r2, r3, r2, lsl #8 + orr r2, rb, r2, lsl #8 #endif mov r0, #0 mov pc, lr ENDPROC(__get_user_2) ENTRY(__get_user_4) + check_uaccess r0, 4, r1, r2, __get_user_bad 4: T(ldr) r2, [r0] mov r0, #0 mov pc, lr |