[PATCH]2.3.99pre9-2, put_user

From: Frank Davis (fdavis112@juno.com)
Date: Sun May 21 2000 - 10:48:20 EST


Hello,
  The following patch addresses the put_user issue described in AC's
2.399pre9-2 JOB list.

-Frank

--- include/asm-i386/uaccess.h.old Fri May 19 20:00:06 2000
+++ include/asm-i386/uaccess.h Sat May 20 22:40:11 2000
@@ -135,16 +135,8 @@
                 :"0" (ptr),"d" (x) \
                 :"cx")
 
-#define put_user(x,ptr) \
-({ int __ret_pu; \
- switch(sizeof (*(ptr))) { \
- case 1: __put_user_x(1,__ret_pu,(__typeof__(*(ptr)))(x),ptr);
break; \
- case 2: __put_user_x(2,__ret_pu,(__typeof__(*(ptr)))(x),ptr);
break; \
- case 4: __put_user_x(4,__ret_pu,(__typeof__(*(ptr)))(x),ptr);
break; \
- default: __put_user_x(X,__ret_pu,x,ptr); break; \
- } \
- __ret_pu; \
-})
+#define put_user(x,ptr) \
+ __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
 
 #define __get_user(x,ptr) \
   __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
@@ -157,6 +149,15 @@
         __put_user_size((x),(ptr),(size),__pu_err); \
         __pu_err; \
 })
+
+#define __put_user_check(x,ptr,size) \
+({ \
+ long __pu_err = -EFAULT; \
+ __typeof__(*(ptr)) *__pu_addr = (ptr); \
+ if (access_ok(VERIFY_WRITE,__pu_addr,size)) \
+ __put_user_size((x),__pu_addr,(size),__pu_err); \
+ __pu_err; \
+})
 
 #define __put_user_size(x,ptr,size,retval) \
 do { \

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue May 23 2000 - 21:00:20 EST