1 files changed, 28 insertions, 36 deletions

diff --git a/include/asm-sh/uaccess_32.h b/include/asm-sh/uaccess_32.h
index 59a9f20c2dc7..b6082f3c1dc4 100644
--- a/include/asm-sh/uaccess_32.h
+++ b/include/asm-sh/uaccess_32.h
@@ -95,11 +95,9 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
 }
 #endif /* CONFIG_MMU */
 
-static inline int access_ok(int type, const void __user *p, unsigned long size)
-{
-        unsigned long addr = (unsigned long)p;
-        return __access_ok(addr, size);
-}
+#define access_ok(type, addr, size)     \
+        (__chk_user_ptr(addr),          \
+         __access_ok((unsigned long __force)(addr), (size)))
 
 /*
  * Uh, these should become the main single-value transfer routines ...
@@ -113,18 +111,16 @@ static inline int access_ok(int type, const void __user *p, unsigned long size)
  * (a) re-use the arguments for side effects (sizeof is ok)
  * (b) require any knowledge of processes at this stage
  */
-#define put_user(x,ptr) __put_user_check((x),(ptr),sizeof(*(ptr)))
-#define get_user(x,ptr) __get_user_check((x),(ptr),sizeof(*(ptr)))
+#define put_user(x,ptr)         __put_user_check((x), (ptr), sizeof(*(ptr)))
+#define get_user(x,ptr)         __get_user_check((x), (ptr), sizeof(*(ptr)))
 
 /*
  * The "__xxx" versions do not do address space checking, useful when
  * doing multiple accesses to the same area (the user has to do the
  * checks by hand with "access_ok()")
  */
-#define __put_user(x,ptr) \
-  __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
-#define __get_user(x,ptr) \
-  __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+#define __put_user(x,ptr)       __put_user_nocheck((x), (ptr), sizeof(*(ptr)))
+#define __get_user(x,ptr)       __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
 
 struct __large_struct { unsigned long buf[100]; };
 #define __m(x) (*(struct __large_struct __user *)(x))
@@ -132,7 +128,6 @@ struct __large_struct { unsigned long buf[100]; };
 #define __get_user_size(x,ptr,size,retval)                      \
 do {                                                            \
         retval = 0;                                             \
-        __chk_user_ptr(ptr);                                    \
         switch (size) {                                         \
         case 1:                                                 \
                 __get_user_asm(x, ptr, retval, "b");            \
@@ -151,24 +146,22 @@ do {								\
 
 #define __get_user_nocheck(x,ptr,size)                          \
 ({                                                              \
-        long __gu_err, __gu_val;                                \
-        __typeof__(*(ptr)) *__pu_addr = (ptr);  \
-        __get_user_size(__gu_val, (__pu_addr), (size), __gu_err);       \
+        long __gu_err;                                          \
+        unsigned long __gu_val;                                 \
+        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
+        __chk_user_ptr(ptr);                                    \
+        __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
         (x) = (__typeof__(*(ptr)))__gu_val;                     \
         __gu_err;                                               \
 })
 
 #define __get_user_check(x,ptr,size)                                    \
 ({                                                                      \
-        long __gu_err, __gu_val;                                        \
-        __typeof__(*(ptr)) *__pu_addr = (ptr);                          \
-        __chk_user_ptr(__pu_addr);                                      \
-        if (likely(__addr_ok((unsigned long)(__pu_addr)))) {            \
-                __get_user_size(__gu_val, (__pu_addr), (size), __gu_err);\
-        } else {                                                        \
-                __gu_err = -EFAULT;                                     \
-                __gu_val = 0;                                           \
-        }                                                               \
+        long __gu_err = -EFAULT;                                        \
+        unsigned long __gu_val = 0;                                     \
+        const __typeof__(*(ptr)) *__gu_addr = (ptr);                    \
+        if (likely(access_ok(VERIFY_READ, __gu_addr, (size))))          \
+                __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
         (x) = (__typeof__(*(ptr)))__gu_val;                             \
         __gu_err;                                                       \
 })
@@ -199,7 +192,6 @@ extern void __get_user_unknown(void);
 #define __put_user_size(x,ptr,size,retval)              \
 do {                                                    \
         retval = 0;                                     \
-        __chk_user_ptr(ptr);                            \
         switch (size) {                                 \
         case 1:                                         \
                 __put_user_asm(x, ptr, retval, "b");    \
@@ -218,22 +210,22 @@ do {							\
         }                                               \
 } while (0)
 
-#define __put_user_nocheck(x,ptr,size)                  \
-({                                                      \
-        long __pu_err;                                  \
-        __put_user_size((x),(ptr),(size),__pu_err);     \
-        __pu_err;                                       \
+#define __put_user_nocheck(x,ptr,size)                          \
+({                                                              \
+        long __pu_err;                                          \
+        __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
+        __chk_user_ptr(ptr);                                    \
+        __put_user_size((x), __pu_addr, (size), __pu_err);      \
+        __pu_err;                                               \
 })
 
 #define __put_user_check(x,ptr,size)                            \
 ({                                                              \
-        long __pu_err;                                          \
+        long __pu_err = -EFAULT;                                \
         __typeof__(*(ptr)) __user *__pu_addr = (ptr);           \
-                                                                \
-        if (likely(__addr_ok((unsigned long)__pu_addr)))        \
-                __put_user_size((x),__pu_addr,(size),__pu_err); \
-        else                                                    \
-                __pu_err = -EFAULT;                             \
+        if (likely(access_ok(VERIFY_WRITE, __pu_addr, size)))   \
+                __put_user_size((x), __pu_addr, (size),         \
+                                __pu_err);                      \
         __pu_err;                                               \
 })