--- arch/arm/include/asm/uaccess.h

+++ arch/arm/include/asm/uaccess.h

@@ -189,6 +189,9 @@ static inline void set_fs(mm_segment_t f

#define access_ok(type,addr,size) (__range_ok(addr,size) == 0)

+#define user_addr_max() \

+ (segment_eq(get_fs(), USER_DS) ? TASK_SIZE : ~0UL)

+

/*

* The "__xxx" versions of the user access functions do not verify the

* address space - it must have been done previously with a separate

@@ -398,9 +401,6 @@ extern unsigned long __must_check __clea

#define __clear_user(addr,n) (memset((void __force *)addr, 0, n), 0)

#endif

-extern unsigned long __must_check __strncpy_from_user(char *to, const char __user *from, unsigned long count);

-extern unsigned long __must_check __strnlen_user(const char __user *s, long n);

-

static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)

{

if (access_ok(VERIFY_READ, from, n))

@@ -427,24 +427,9 @@ static inline unsigned long __must_check

return n;

}

-static inline long __must_check strncpy_from_user(char *dst, const char __user *src, long count)

-{

- long res = -EFAULT;

- if (access_ok(VERIFY_READ, src, 1))

- res = __strncpy_from_user(dst, src, count);

- return res;

-}

-

-#define strlen_user(s) strnlen_user(s, ~0UL >> 1)

+extern long strncpy_from_user(char *dest, const char __user *src, long count);

-static inline long __must_check strnlen_user(const char __user *s, long n)

-{

- unsigned long res = 0;

-

- if (__addr_ok(s))

- res = __strnlen_user(s, n);

-

- return res;

-}

+extern __must_check long strlen_user(const char __user *str);

+extern __must_check long strnlen_user(const char __user *str, long n);

#endif /* _ASMARM_UACCESS_H */