Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] frv: __user infrastructure

Browse source 
Add general annotations to the FRV arch for sparse.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-06-23 02:04:03 -07:00 committed by Linus Torvalds
parent 86c3a7645c
commit a8a77573c9
2 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/frv/kernel/uaccess.c
View file

@ -17,7 +17,7 @@
/* /*
* copy a null terminated string from userspace * copy a null terminated string from userspace
*/ */
long strncpy_from_user(char *dst, const char *src, long count) long strncpy_from_user(char *dst, const char __user *src, long count)
{ {
unsigned long max; unsigned long max;
char *p, ch; char *p, ch;
@ -70,9 +70,9 @@ EXPORT_SYMBOL(strncpy_from_user);
* *
* Return 0 on exception, a value greater than N if too long * Return 0 on exception, a value greater than N if too long
*/ */
long strnlen_user(const char *src, long count) long strnlen_user(const char __user *src, long count)
{ {
const char *p; const char __user *p;
long err = 0; long err = 0;
char ch; char ch;

64
include/asm-frv/uaccess.h
View file

@ -22,7 +22,7 @@
#define HAVE_ARCH_UNMAPPED_AREA /* we decide where to put mmaps */ #define HAVE_ARCH_UNMAPPED_AREA /* we decide where to put mmaps */
#define __ptr(x) ((unsigned long *)(x)) #define __ptr(x) ((unsigned long __force *)(x))
#define VERIFY_READ 0 #define VERIFY_READ 0
#define VERIFY_WRITE 1 #define VERIFY_WRITE 1
@ -64,7 +64,7 @@ static inline int ___range_ok(unsigned long addr, unsigned long size)
#define __range_ok(addr,size) ___range_ok((unsigned long) (addr), (unsigned long) (size)) #define __range_ok(addr,size) ___range_ok((unsigned long) (addr), (unsigned long) (size))
#define access_ok(type,addr,size) (__range_ok((addr), (size)) == 0) #define access_ok(type,addr,size) (__range_ok((void __user *)(addr), (size)) == 0)
#define __access_ok(addr,size) (__range_ok((addr), (size)) == 0) #define __access_ok(addr,size) (__range_ok((addr), (size)) == 0)
/* /*
@ -97,6 +97,7 @@ extern unsigned long search_exception_table(unsigned long);
int __pu_err = 0; \ int __pu_err = 0; \
\ \
typeof(*(ptr)) __pu_val = (x); \ typeof(*(ptr)) __pu_val = (x); \
__chk_user_ptr(ptr); \
\ \
switch (sizeof (*(ptr))) { \ switch (sizeof (*(ptr))) { \
case 1: \ case 1: \
@ -120,7 +121,7 @@ extern unsigned long search_exception_table(unsigned long);
#define put_user(x, ptr) \ #define put_user(x, ptr) \
({ \ ({ \
typeof(&*ptr) _p = (ptr); \ typeof(*(ptr)) __user *_p = (ptr); \
int _e; \ int _e; \
\ \
_e = __range_ok(_p, sizeof(*_p)); \ _e = __range_ok(_p, sizeof(*_p)); \
@ -175,33 +176,44 @@ do { \
*/ */
#define __get_user(x, ptr) \ #define __get_user(x, ptr) \
({ \ ({ \
typeof(*(ptr)) __gu_val = 0; \
int __gu_err = 0; \ int __gu_err = 0; \
__chk_user_ptr(ptr); \
\ \
switch (sizeof(*(ptr))) { \ switch (sizeof(*(ptr))) { \
case 1: \ case 1: { \
__get_user_asm(__gu_err, *(u8*)&__gu_val, ptr, "ub", "=r"); \ unsigned char __gu_val; \
__get_user_asm(__gu_err, __gu_val, ptr, "ub", "=r"); \
(x) = *(__force __typeof__(*(ptr)) *) &__gu_val; \
break; \ break; \
case 2: \ } \
__get_user_asm(__gu_err, *(u16*)&__gu_val, ptr, "uh", "=r"); \ case 2: { \
unsigned short __gu_val; \
__get_user_asm(__gu_err, __gu_val, ptr, "uh", "=r"); \
(x) = *(__force __typeof__(*(ptr)) *) &__gu_val; \
break; \ break; \
case 4: \ } \
__get_user_asm(__gu_err, *(u32*)&__gu_val, ptr, "", "=r"); \ case 4: { \
unsigned int __gu_val; \
__get_user_asm(__gu_err, __gu_val, ptr, "", "=r"); \
(x) = *(__force __typeof__(*(ptr)) *) &__gu_val; \
break; \ break; \
case 8: \ } \
__get_user_asm(__gu_err, *(u64*)&__gu_val, ptr, "d", "=e"); \ case 8: { \
unsigned long long __gu_val; \
__get_user_asm(__gu_err, __gu_val, ptr, "d", "=e"); \
(x) = *(__force __typeof__(*(ptr)) *) &__gu_val; \
break; \ break; \
} \
default: \ default: \
__gu_err = __get_user_bad(); \ __gu_err = __get_user_bad(); \
break; \ break; \
} \ } \
(x) = __gu_val; \
__gu_err; \ __gu_err; \
}) })
#define get_user(x, ptr) \ #define get_user(x, ptr) \
({ \ ({ \
typeof(&*ptr) _p = (ptr); \ const typeof(*(ptr)) __user *_p = (ptr);\
int _e; \ int _e; \
\ \
_e = __range_ok(_p, sizeof(*_p)); \ _e = __range_ok(_p, sizeof(*_p)); \
@ -248,19 +260,20 @@ do { \
/* /*
* *
*/ */
#define ____force(x) (__force void *)(void __user *)(x)
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
extern long __memset_user(void *dst, unsigned long count); extern long __memset_user(void *dst, unsigned long count);
extern long __memcpy_user(void *dst, const void *src, unsigned long count); extern long __memcpy_user(void *dst, const void *src, unsigned long count);
#define clear_user(dst,count) __memset_user((dst), (count)) #define clear_user(dst,count) __memset_user(____force(dst), (count))
#define __copy_from_user_inatomic(to, from, n) __memcpy_user((to), (from), (n)) #define __copy_from_user_inatomic(to, from, n) __memcpy_user((to), ____force(from), (n))
#define __copy_to_user_inatomic(to, from, n) __memcpy_user((to), (from), (n)) #define __copy_to_user_inatomic(to, from, n) __memcpy_user(____force(to), (from), (n))
#else #else
#define clear_user(dst,count) (memset((dst), 0, (count)), 0) #define clear_user(dst,count) (memset(____force(dst), 0, (count)), 0)
#define __copy_from_user_inatomic(to, from, n) (memcpy((to), (from), (n)), 0) #define __copy_from_user_inatomic(to, from, n) (memcpy((to), ____force(from), (n)), 0)
#define __copy_to_user_inatomic(to, from, n) (memcpy((to), (from), (n)), 0) #define __copy_to_user_inatomic(to, from, n) (memcpy(____force(to), (from), (n)), 0)
#endif #endif
@ -278,7 +291,7 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
return __copy_from_user_inatomic(to, from, n); return __copy_from_user_inatomic(to, from, n);
} }
static inline long copy_from_user(void *to, const void *from, unsigned long n) static inline long copy_from_user(void *to, const void __user *from, unsigned long n)
{ {
unsigned long ret = n; unsigned long ret = n;
@ -291,16 +304,13 @@ static inline long copy_from_user(void *to, const void *from, unsigned long n)
return ret; return ret;
} }
static inline long copy_to_user(void *to, const void *from, unsigned long n) static inline long copy_to_user(void __user *to, const void *from, unsigned long n)
{ {
return likely(__access_ok(to, n)) ? __copy_to_user(to, from, n) : n; return likely(__access_ok(to, n)) ? __copy_to_user(to, from, n) : n;
} }
#define copy_to_user_ret(to,from,n,retval) ({ if (copy_to_user(to,from,n)) return retval; }) extern long strncpy_from_user(char *dst, const char __user *src, long count);
#define copy_from_user_ret(to,from,n,retval) ({ if (copy_from_user(to,from,n)) return retval; }) extern long strnlen_user(const char __user *src, long count);
extern long strncpy_from_user(char *dst, const char *src, long count);
extern long strnlen_user(const char *src, long count);
#define strlen_user(str) strnlen_user(str, 32767) #define strlen_user(str) strnlen_user(str, 32767)