Commit 85c39206 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] uaccess.h annotations (uml) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2624f124

arch/um/kernel/skas/include/uaccess-skas.h

+7 −7
Original line number Diff line number Diff line
@@ -18,18 +18,18 @@ 
	  ((unsigned long) (addr) + (size) <= FIXADDR_USER_END) && \

	  ((unsigned long) (addr) + (size) >= (unsigned long)(addr))))



static inline int verify_area_skas(int type, const void * addr,

static inline int verify_area_skas(int type, const void __user * addr,

                                   unsigned long size)

{

	return(access_ok_skas(type, addr, size) ? 0 : -EFAULT);

}



extern int copy_from_user_skas(void *to, const void *from, int n);

extern int copy_to_user_skas(void *to, const void *from, int n);

extern int strncpy_from_user_skas(char *dst, const char *src, int count);

extern int __clear_user_skas(void *mem, int len);

extern int clear_user_skas(void *mem, int len);

extern int strnlen_user_skas(const void *str, int len);

extern int copy_from_user_skas(void *to, const void __user *from, int n);

extern int copy_to_user_skas(void __user *to, const void *from, int n);

extern int strncpy_from_user_skas(char *dst, const char __user *src, int count);

extern int __clear_user_skas(void __user *mem, int len);

extern int clear_user_skas(void __user *mem, int len);

extern int strnlen_user_skas(const void __user *str, int len);



#endif

arch/um/kernel/tt/include/uaccess-tt.h

+7 −7
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern unsigned long uml_physmem; 
         (((unsigned long) (addr) <= ((unsigned long) (addr) + (size))) && \

          (under_task_size(addr, size) || is_stack(addr, size))))



static inline int verify_area_tt(int type, const void * addr,

static inline int verify_area_tt(int type, const void __user * addr,

                                 unsigned long size)

{

	return(access_ok_tt(type, addr, size) ? 0 : -EFAULT);
@@ -50,12 +50,12 @@ extern int __do_clear_user(void *mem, size_t len, void **fault_addr, 
extern int __do_strnlen_user(const char *str, unsigned long n,

			     void **fault_addr, void **fault_catcher);



extern int copy_from_user_tt(void *to, const void *from, int n);

extern int copy_to_user_tt(void *to, const void *from, int n);

extern int strncpy_from_user_tt(char *dst, const char *src, int count);

extern int __clear_user_tt(void *mem, int len);

extern int clear_user_tt(void *mem, int len);

extern int strnlen_user_tt(const void *str, int len);

extern int copy_from_user_tt(void *to, const void __user *from, int n);

extern int copy_to_user_tt(void __user *to, const void *from, int n);

extern int strncpy_from_user_tt(char *dst, const char __user *src, int count);

extern int __clear_user_tt(void __user *mem, int len);

extern int clear_user_tt(void __user *mem, int len);

extern int strnlen_user_tt(const void __user *str, int len);



#endif