This patch converts verify_area to access_ok for include/asm-mips.
Yoichi
Signed-off-by: Yoichi Yuasa <[EMAIL PROTECTED]>
diff -urN -X dontdiff a-orig/include/asm-mips/uaccess.h
a/include/asm-mips/uaccess.h
--- a-orig/include/asm-mips/uaccess.h Sat Mar 5 04:15:22 2005
+++ a/include/asm-mips/uaccess.h Sun Mar 6 15:51:02 2005
@@ -254,13 +254,11 @@
({ \
__typeof__(*(ptr)) __gu_val = 0; \
long __gu_addr; \
- long __gu_err; \
+ long __gu_err = -EFAULT; \
\
might_sleep(); \
__gu_addr = (long) (ptr); \
- __gu_err = verify_area(VERIFY_READ, (void *) __gu_addr, size); \
- \
- if (likely(!__gu_err)) { \
+ if (access_ok(VERIFY_READ, (void *) __gu_addr, size)) { \
switch (size) { \
case 1: __get_user_asm("lb", __gu_err); break; \
case 2: __get_user_asm("lh", __gu_err); break; \
@@ -348,14 +346,12 @@
({ \
__typeof__(*(ptr)) __pu_val; \
long __pu_addr; \
- long __pu_err; \
+ long __pu_err = -EFAULT; \
\
might_sleep(); \
__pu_val = (x); \
__pu_addr = (long) (ptr); \
- __pu_err = verify_area(VERIFY_WRITE, (void *) __pu_addr, size); \
- \
- if (likely(!__pu_err)) { \
+ if (access_ok(VERIFY_WRITE, (void *) __pu_addr, size)) { \
switch (size) { \
case 1: __put_user_asm("sb", __pu_val); break; \
case 2: __put_user_asm("sh", __pu_val); break; \
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
