evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: don't always use EFAULT on __put_user_size.

Browse source 
Let the user of the macro specify the desired return.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber Costa 2008-06-25 12:00:44 -03:00 • committed by Ingo Molnar
parent 293e6a2524
commit d42e6af613
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/asm-x86/uaccess_64.h
View file

@ -37,7 +37,7 @@ extern void __put_user_bad(void);
#define __put_user_nocheck(x, ptr, size) \ #define __put_user_nocheck(x, ptr, size) \
({ \ ({ \
int __pu_err; \ int __pu_err; \
__put_user_size((x), (ptr), (size), __pu_err); \ __put_user_size((x), (ptr), (size), __pu_err, -EFAULT); \
__pu_err; \ __pu_err; \
}) })
@ -65,22 +65,22 @@ extern void __put_user_bad(void);
__pu_err; \ __pu_err; \
}) })
#define __put_user_size(x, ptr, size, retval) \ #define __put_user_size(x, ptr, size, retval, errret) \
do { \ do { \
retval = 0; \ retval = 0; \
__chk_user_ptr(ptr); \ __chk_user_ptr(ptr); \
switch (size) { \ switch (size) { \
case 1: \ case 1: \
__put_user_asm(x, ptr, retval, "b", "b", "iq", -EFAULT);\ __put_user_asm(x, ptr, retval, "b", "b", "iq", errret);\
break; \ break; \
case 2: \ case 2: \
__put_user_asm(x, ptr, retval, "w", "w", "ir", -EFAULT);\ __put_user_asm(x, ptr, retval, "w", "w", "ir", errret);\
break; \ break; \
case 4: \ case 4: \
__put_user_asm(x, ptr, retval, "l", "k", "ir", -EFAULT);\ __put_user_asm(x, ptr, retval, "l", "k", "ir", errret);\
break; \ break; \
case 8: \ case 8: \
__put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT); \ __put_user_asm(x, ptr, retval, "q", "", "Zr", errret); \
break; \ break; \
default: \ default: \
__put_user_bad(); \ __put_user_bad(); \