.. | .. |
---|
21 | 21 | unsigned long __ao_end = __ao_a + __ao_b - !!__ao_b; \ |
---|
22 | 22 | __ao_end >= __ao_a && __addr_ok(__ao_end); }) |
---|
23 | 23 | |
---|
24 | | -#define access_ok(type, addr, size) \ |
---|
| 24 | +#define access_ok(addr, size) \ |
---|
25 | 25 | (__chk_user_ptr(addr), \ |
---|
26 | 26 | __access_ok((unsigned long __force)(addr), (size))) |
---|
27 | 27 | |
---|
.. | .. |
---|
69 | 69 | long __gu_err = -EFAULT; \ |
---|
70 | 70 | unsigned long __gu_val = 0; \ |
---|
71 | 71 | const __typeof__(*(ptr)) *__gu_addr = (ptr); \ |
---|
72 | | - if (likely(access_ok(VERIFY_READ, __gu_addr, (size)))) \ |
---|
| 72 | + if (likely(access_ok(__gu_addr, (size)))) \ |
---|
73 | 73 | __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \ |
---|
74 | 74 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
---|
75 | 75 | __gu_err; \ |
---|
.. | .. |
---|
90 | 90 | long __pu_err = -EFAULT; \ |
---|
91 | 91 | __typeof__(*(ptr)) __user *__pu_addr = (ptr); \ |
---|
92 | 92 | __typeof__(*(ptr)) __pu_val = x; \ |
---|
93 | | - if (likely(access_ok(VERIFY_WRITE, __pu_addr, size))) \ |
---|
| 93 | + if (likely(access_ok(__pu_addr, size))) \ |
---|
94 | 94 | __put_user_size(__pu_val, __pu_addr, (size), \ |
---|
95 | 95 | __pu_err); \ |
---|
96 | 96 | __pu_err; \ |
---|
97 | 97 | }) |
---|
98 | 98 | |
---|
99 | | -#ifdef CONFIG_SUPERH32 |
---|
100 | 99 | # include <asm/uaccess_32.h> |
---|
101 | | -#else |
---|
102 | | -# include <asm/uaccess_64.h> |
---|
103 | | -#endif |
---|
104 | 100 | |
---|
105 | 101 | extern long strncpy_from_user(char *dest, const char __user *src, long count); |
---|
106 | 102 | |
---|
.. | .. |
---|
135 | 131 | void __user * __cl_addr = (addr); \ |
---|
136 | 132 | unsigned long __cl_size = (n); \ |
---|
137 | 133 | \ |
---|
138 | | - if (__cl_size && access_ok(VERIFY_WRITE, \ |
---|
139 | | - ((unsigned long)(__cl_addr)), __cl_size)) \ |
---|
| 134 | + if (__cl_size && access_ok(__cl_addr, __cl_size)) \ |
---|
140 | 135 | __cl_size = __clear_user(__cl_addr, __cl_size); \ |
---|
141 | 136 | \ |
---|
142 | 137 | __cl_size; \ |
---|