mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-14 06:35:12 +00:00
Code Issues Releases Wiki Activity

[PATCH] m68k: basic __user annotations

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-01-12 01:06:24 -08:00 committed by Linus Torvalds
parent ad9ec4f8de
commit 11c40f8a6a
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/asm-m68k/uaccess.h
View file

@ -42,6 +42,7 @@ struct exception_table_entry
({ \ ({ \
int __pu_err; \ int __pu_err; \
typeof(*(ptr)) __pu_val = (x); \ typeof(*(ptr)) __pu_val = (x); \
__chk_user_ptr(ptr); \
switch (sizeof (*(ptr))) { \ switch (sizeof (*(ptr))) { \
case 1: \ case 1: \
__put_user_asm(__pu_err, __pu_val, ptr, b); \ __put_user_asm(__pu_err, __pu_val, ptr, b); \
@ -91,6 +92,7 @@ __asm__ __volatile__ \
({ \ ({ \
int __gu_err; \ int __gu_err; \
typeof(*(ptr)) __gu_val; \ typeof(*(ptr)) __gu_val; \
__chk_user_ptr(ptr); \
switch (sizeof(*(ptr))) { \ switch (sizeof(*(ptr))) { \
case 1: \ case 1: \
__get_user_asm(__gu_err, __gu_val, ptr, b, "=d"); \ __get_user_asm(__gu_err, __gu_val, ptr, b, "=d"); \
@ -105,7 +107,7 @@ __asm__ __volatile__ \
__gu_err = __constant_copy_from_user(&__gu_val, ptr, 8); \ __gu_err = __constant_copy_from_user(&__gu_val, ptr, 8); \
break; \ break; \
default: \ default: \
__gu_val = 0; \ __gu_val = (typeof(*(ptr)))0; \
__gu_err = __get_user_bad(); \ __gu_err = __get_user_bad(); \
break; \ break; \
} \ } \
@ -134,7 +136,7 @@ __asm__ __volatile__ \
: "m"(*(ptr)), "i" (-EFAULT), "0"(0)) : "m"(*(ptr)), "i" (-EFAULT), "0"(0))
static inline unsigned long static inline unsigned long
__generic_copy_from_user(void *to, const void *from, unsigned long n) __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
{ {
unsigned long tmp; unsigned long tmp;
__asm__ __volatile__ __asm__ __volatile__
@ -189,7 +191,7 @@ __generic_copy_from_user(void *to, const void *from, unsigned long n)
} }
static inline unsigned long static inline unsigned long
__generic_copy_to_user(void *to, const void *from, unsigned long n) __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
{ {
unsigned long tmp; unsigned long tmp;
__asm__ __volatile__ __asm__ __volatile__
@ -264,7 +266,7 @@ __generic_copy_to_user(void *to, const void *from, unsigned long n)
: "d0", "memory") : "d0", "memory")
static inline unsigned long static inline unsigned long
__constant_copy_from_user(void *to, const void *from, unsigned long n) __constant_copy_from_user(void *to, const void __user *from, unsigned long n)
{ {
switch (n) { switch (n) {
case 0: case 0:
@ -520,7 +522,7 @@ __constant_copy_from_user(void *to, const void *from, unsigned long n)
#define __copy_from_user_inatomic __copy_from_user #define __copy_from_user_inatomic __copy_from_user
static inline unsigned long static inline unsigned long
__constant_copy_to_user(void *to, const void *from, unsigned long n) __constant_copy_to_user(void __user *to, const void *from, unsigned long n)
{ {
switch (n) { switch (n) {
case 0: case 0:
@ -766,7 +768,7 @@ __constant_copy_to_user(void *to, const void *from, unsigned long n)
*/ */
static inline long static inline long
strncpy_from_user(char *dst, const char *src, long count) strncpy_from_user(char *dst, const char __user *src, long count)
{ {
long res; long res;
if (count == 0) return count; if (count == 0) return count;
@ -799,7 +801,7 @@ strncpy_from_user(char *dst, const char *src, long count)
* *
* Return 0 on exception, a value greater than N if too long * Return 0 on exception, a value greater than N if too long
*/ */
static inline long strnlen_user(const char *src, long n) static inline long strnlen_user(const char __user *src, long n)
{ {
long res; long res;
@ -842,7 +844,7 @@ static inline long strnlen_user(const char *src, long n)
*/ */
static inline unsigned long static inline unsigned long
clear_user(void *to, unsigned long n) clear_user(void __user *to, unsigned long n)
{ {
__asm__ __volatile__ __asm__ __volatile__
(" tstl %1\n" (" tstl %1\n"