x86: uaccess: use errret as error value in __put_user_size()
PATCH 1/1 x86: uaccess: use errret as error value in __put_user_size()
From: Hiroshi Shimamoto <[email protected]>
Impact: cleanup
In __put_user_size() macro errret is used for error value. But if size is 8, errret isn't passed to__put_user_asm_u64(). This behavior is inconsistent.
Signed-off-by Hiroshi Shimamoto <[email protected]>
--- arch/x86/include/asm/uaccess.h | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-)
arch/x86/include/asm/uaccess.h +6 -5
@@ -186,7 +186,7 @@ extern int __get_user_bad(void);#ifdef CONFIG_X86_32 -#define __put_user_asm_u64 (x, addr, err) \ +#define __put_user_asm_u64 (x, addr, err, errret) \ asm volatile("1: movl %%eax,0(%2)\n" \ "2: movl %%edx,4(%2)\n" \ "3:\n" \
@@ -197,7 +197,7 @@ extern int __get_user_bad(void); _ASM_EXTABLE(1b, 4b) \_ASM_EXTABLE (2b ,4b ) \ : "=r" (err) \ - : "A" (x), "r" (addr), "i" (-EFAULT), "0" (err)) + : "A" (x), "r" (addr), "i" (errret), "0" (err)) #define __put_user_asm_ex_u64(x, addr) \ asm volatile("1: movl %%eax,0(%1)\n" \
@@ -211,8 +211,8 @@ extern int __get_user_bad(void); asmvolatile ("call __put_user_8" :"=a" (__ret_pu) \ : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")#else -#define __put_user_asm_u64 (x, ptr, retval) \ - __put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT) +#define __put_user_asm_u64 (x, ptr, retval, errret) \ + __put_user_asm(x, ptr, retval, "q", "", "Zr", errret)#define __put_user_asm_ex_u64 (x, addr) \ __put_user_asm_ex(x, addr, "q", "", "Zr")#define __put_user_x8 (x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu)
@@ -289,7 +289,8 @@ do { \__put_user_asm (x, ptr, retval,"l" ,"k" ,"ir" , errret); \break ; \case 8 : \ -__put_user_asm_u64 ((__typeof__ (*ptr))(x), ptr, retval); \ +__put_user_asm_u64 ((__typeof__ (*ptr))(x), ptr, retval, \ + errret); \break ; \default : \__put_user_bad (); \
Signature · 1 line
1.6.0.4
Quoted 9 lines · Hiroshi Shimamoto
From: Hiroshi Shimamoto <[email protected]>
Impact: cleanup
In
__put_user_size()macro errret is used for error value. But if size is 8, errret isn't passedto__put_user_asm_u64(). This behavior is inconsistent.Signed-off-by Hiroshi Shimamoto <[email protected]>
Applied to tip:x86/uaccess, thanks!
-hpa