|
@@ -164,7 +164,8 @@ do { \
|
|
|
|
|
|
#define __get_user_nocheck(x,ptr,size) \
|
|
#define __get_user_nocheck(x,ptr,size) \
|
|
({ \
|
|
({ \
|
|
- long __gu_err, __gu_val; \
|
|
|
|
|
|
+ long __gu_err; \
|
|
|
|
+ unsigned long __gu_val; \
|
|
might_sleep(); \
|
|
might_sleep(); \
|
|
__get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\
|
|
__get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\
|
|
(x) = (__typeof__(*(ptr)))__gu_val; \
|
|
(x) = (__typeof__(*(ptr)))__gu_val; \
|
|
@@ -173,7 +174,8 @@ do { \
|
|
|
|
|
|
#define __get_user_check(x,ptr,size) \
|
|
#define __get_user_check(x,ptr,size) \
|
|
({ \
|
|
({ \
|
|
- long __gu_err = -EFAULT, __gu_val = 0; \
|
|
|
|
|
|
+ long __gu_err = -EFAULT; \
|
|
|
|
+ unsigned long __gu_val = 0; \
|
|
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
|
|
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
|
|
might_sleep(); \
|
|
might_sleep(); \
|
|
if (access_ok(VERIFY_READ,__gu_addr,size)) \
|
|
if (access_ok(VERIFY_READ,__gu_addr,size)) \
|