|
@@ -249,10 +249,17 @@ do { \
|
|
|
} \
|
|
|
} while (0)
|
|
|
|
|
|
+/*
|
|
|
+ * This is a type: either unsigned long, if the argument fits into
|
|
|
+ * that type, or otherwise unsigned long long.
|
|
|
+ */
|
|
|
+#define __long_type(x) \
|
|
|
+ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
|
|
|
+
|
|
|
#define __get_user_nocheck(x, ptr, size) \
|
|
|
({ \
|
|
|
long __gu_err; \
|
|
|
- unsigned long __gu_val; \
|
|
|
+ __long_type(*(ptr)) __gu_val; \
|
|
|
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
|
|
|
__chk_user_ptr(ptr); \
|
|
|
if (!is_kernel_addr((unsigned long)__gu_addr)) \
|
|
@@ -266,7 +273,7 @@ do { \
|
|
|
#define __get_user_check(x, ptr, size) \
|
|
|
({ \
|
|
|
long __gu_err = -EFAULT; \
|
|
|
- unsigned long __gu_val = 0; \
|
|
|
+ __long_type(*(ptr)) __gu_val = 0; \
|
|
|
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
|
|
|
might_fault(); \
|
|
|
if (access_ok(VERIFY_READ, __gu_addr, (size))) { \
|
|
@@ -280,7 +287,7 @@ do { \
|
|
|
#define __get_user_nosleep(x, ptr, size) \
|
|
|
({ \
|
|
|
long __gu_err; \
|
|
|
- unsigned long __gu_val; \
|
|
|
+ __long_type(*(ptr)) __gu_val; \
|
|
|
const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \
|
|
|
__chk_user_ptr(ptr); \
|
|
|
barrier_nospec(); \
|