lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] remove verify_area(): remove verify_area() from various uaccess.h headers

Browse Source 
Remove the deprecated (and unused) verify_area() from various uaccess.h
headers.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jesper Juhl
2005-09-06 15:17:49 -07:00
committed by Linus Torvalds
parent 5e5d7a2229
commit 97de50c0ad
23 changed files with 0 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/um/include/um_uaccess.h
View File

@@ -20,13 +20,6 @@
#define access_ok(type, addr, size) \ #define access_ok(type, addr, size) \
CHOOSE_MODE_PROC(access_ok_tt, access_ok_skas, type, addr, size) CHOOSE_MODE_PROC(access_ok_tt, access_ok_skas, type, addr, size)
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void __user *addr, unsigned long size)
{
return (CHOOSE_MODE_PROC(verify_area_tt, verify_area_skas, type, addr,
size));
}
static inline int copy_from_user(void *to, const void __user *from, int n) static inline int copy_from_user(void *to, const void __user *from, int n)
{ {
return(CHOOSE_MODE_PROC(copy_from_user_tt, copy_from_user_skas, to, return(CHOOSE_MODE_PROC(copy_from_user_tt, copy_from_user_skas, to,

6
include/asm-alpha/uaccess.h
View File

@@ -48,12 +48,6 @@
__access_ok(((unsigned long)(addr)),(size),get_fs()); \ __access_ok(((unsigned long)(addr)),(size),get_fs()); \
}) })
/* this function will go away soon - use access_ok() instead */
extern inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
/* /*
* These are the main single-value transfer routines. They automatically * These are the main single-value transfer routines. They automatically
* use the right size if we just have the right pointer type. * use the right size if we just have the right pointer type.

6
include/asm-arm/uaccess.h
View File

@@ -77,12 +77,6 @@ static inline void set_fs (mm_segment_t fs)
#define access_ok(type,addr,size) (__range_ok(addr,size) == 0) #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void __user *addr, unsigned long size)
{
return access_ok(type, addr, size) ? 0 : -EFAULT;
}
/* /*
* Single-value transfer routines. They automatically use the right * Single-value transfer routines. They automatically use the right
* size if we just have the right pointer type. Note that the functions * size if we just have the right pointer type. Note that the functions

6
include/asm-arm26/uaccess.h
View File

@@ -40,12 +40,6 @@ extern int fixup_exception(struct pt_regs *regs);
#define access_ok(type,addr,size) (__range_ok(addr,size) == 0) #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void * addr, unsigned long size)
{
return access_ok(type, addr, size) ? 0 : -EFAULT;
}
/* /*
* Single-value transfer routines. They automatically use the right * Single-value transfer routines. They automatically use the right
* size if we just have the right pointer type. Note that the functions * size if we just have the right pointer type. Note that the functions

7
include/asm-cris/uaccess.h
View File

@@ -91,13 +91,6 @@
#define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size))) #define __access_ok(addr,size) (__kernel_ok || __user_ok((addr),(size)))
#define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size)) #define access_ok(type,addr,size) __access_ok((unsigned long)(addr),(size))
/* this function will go away soon - use access_ok() instead */
extern inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
#include <asm/arch/uaccess.h> #include <asm/arch/uaccess.h>
/* /*

6
include/asm-frv/uaccess.h
View File

@@ -67,12 +67,6 @@ static inline int ___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((addr), (size)) == 0)
#define __access_ok(addr,size) (__range_ok((addr), (size)) == 0) #define __access_ok(addr,size) (__range_ok((addr), (size)) == 0)
/* this function will go away soon - use access_ok() / __range_ok() instead */
static inline int __deprecated verify_area(int type, const void * addr, unsigned long size)
{
return __range_ok(addr, size);
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

6
include/asm-h8300/uaccess.h
View File

@@ -24,12 +24,6 @@ static inline int __access_ok(unsigned long addr, unsigned long size)
return(RANGE_CHECK_OK(addr, size, 0L, (unsigned long)&_ramend)); return(RANGE_CHECK_OK(addr, size, 0L, (unsigned long)&_ramend));
} }
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void *addr, unsigned long size)
{
return access_ok(type,addr,size)?0:-EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

24
include/asm-i386/uaccess.h
View File

@@ -83,30 +83,6 @@ extern struct movsl_mask {
*/ */
#define access_ok(type,addr,size) (likely(__range_ok(addr,size) == 0)) #define access_ok(type,addr,size) (likely(__range_ok(addr,size) == 0))
/**
* verify_area: - Obsolete/deprecated and will go away soon,
* use access_ok() instead.
* @type: Type of access: %VERIFY_READ or %VERIFY_WRITE
* @addr: User space pointer to start of block to check
* @size: Size of block to check
*
* Context: User context only. This function may sleep.
*
* This function has been replaced by access_ok().
*
* Checks if a pointer to a block of memory in user space is valid.
*
* Returns zero if the memory block may be valid, -EFAULT
* if it is definitely invalid.
*
* See access_ok() for more details.
*/
static inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

7
include/asm-ia64/uaccess.h
View File

@@ -72,13 +72,6 @@
}) })
#define access_ok(type, addr, size) __access_ok((addr), (size), get_fs()) #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated
verify_area (int type, const void __user *addr, unsigned long size)
{
return access_ok(type, addr, size) ? 0 : -EFAULT;
}
/* /*
* These are the main single-value transfer routines. They automatically * These are the main single-value transfer routines. They automatically
* use the right size if we just have the right pointer type. * use the right size if we just have the right pointer type.

25
include/asm-m32r/uaccess.h
View File

@@ -120,31 +120,6 @@ static inline int access_ok(int type, const void *addr, unsigned long size)
} }
#endif /* CONFIG_MMU */ #endif /* CONFIG_MMU */
/**
* verify_area: - Obsolete/deprecated and will go away soon,
* use access_ok() instead.
* @type: Type of access: %VERIFY_READ or %VERIFY_WRITE
* @addr: User space pointer to start of block to check
* @size: Size of block to check
*
* Context: User context only. This function may sleep.
*
* This function has been replaced by access_ok().
*
* Checks if a pointer to a block of memory in user space is valid.
*
* Returns zero if the memory block may be valid, -EFAULT
* if it is definitely invalid.
*
* See access_ok() for more details.
*/
static inline int __deprecated verify_area(int type, const void __user *addr,
unsigned long size)
{
return access_ok(type, addr, size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

6
include/asm-m68k/uaccess.h
View File

@@ -14,12 +14,6 @@
/* We let the MMU do all checking */ /* We let the MMU do all checking */
#define access_ok(type,addr,size) 1 #define access_ok(type,addr,size) 1
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void *addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

6
include/asm-m68knommu/uaccess.h
View File

@@ -23,12 +23,6 @@ static inline int _access_ok(unsigned long addr, unsigned long size)
(is_in_rom(addr) && is_in_rom(addr+size))); (is_in_rom(addr) && is_in_rom(addr+size)));
} }
/* this function will go away soon - use access_ok() instead */
extern inline int __deprecated verify_area(int type, const void * addr, unsigned long size)
{
return access_ok(type,addr,size)?0:-EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

23
include/asm-mips/uaccess.h
View File

@@ -111,29 +111,6 @@
#define access_ok(type, addr, size) \ #define access_ok(type, addr, size) \
likely(__access_ok((unsigned long)(addr), (size),__access_mask)) likely(__access_ok((unsigned long)(addr), (size),__access_mask))
/*
* verify_area: - Obsolete/deprecated and will go away soon,
* use access_ok() instead.
* @type: Type of access: %VERIFY_READ or %VERIFY_WRITE
* @addr: User space pointer to start of block to check
* @size: Size of block to check
*
* Context: User context only. This function may sleep.
*
* This function has been replaced by access_ok().
*
* Checks if a pointer to a block of memory in user space is valid.
*
* Returns zero if the memory block may be valid, -EFAULT
* if it is definitely invalid.
*
* See access_ok() for more details.
*/
static inline int __deprecated verify_area(int type, const void * addr, unsigned long size)
{
return access_ok(type, addr, size) ? 0 : -EFAULT;
}
/* /*
* put_user: - Write a simple value into user space. * put_user: - Write a simple value into user space.
* @x: Value to copy to user space. * @x: Value to copy to user space.

4
include/asm-parisc/uaccess.h
View File

@@ -40,10 +40,6 @@ static inline long access_ok(int type, const void __user * addr,
return 1; return 1;
} }
#define verify_area(type,addr,size) (0) /* FIXME: all users should go away soon,
* and use access_ok instead, then this
* should be removed. */
#define put_user __put_user #define put_user __put_user
#define get_user __get_user #define get_user __get_user

7
include/asm-ppc/uaccess.h
View File

@@ -37,13 +37,6 @@
#define access_ok(type, addr, size) \ #define access_ok(type, addr, size) \
(__chk_user_ptr(addr),__access_ok((unsigned long)(addr),(size))) (__chk_user_ptr(addr),__access_ok((unsigned long)(addr),(size)))
/* this function will go away soon - use access_ok() instead */
extern inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return access_ok(type, addr, size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

7
include/asm-ppc64/uaccess.h
View File

@@ -56,13 +56,6 @@
#define access_ok(type,addr,size) \ #define access_ok(type,addr,size) \
__access_ok(((__force unsigned long)(addr)),(size),get_fs()) __access_ok(((__force unsigned long)(addr)),(size),get_fs())
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void __user *addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

7
include/asm-s390/uaccess.h
View File

@@ -65,13 +65,6 @@
#define access_ok(type,addr,size) __access_ok(addr,size) #define access_ok(type,addr,size) __access_ok(addr,size)
/* this function will go away soon - use access_ok() instead */
extern inline int __deprecated verify_area(int type, const void __user *addr,
unsigned long size)
{
return access_ok(type, addr, size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

6
include/asm-sh/uaccess.h
View File

@@ -146,12 +146,6 @@ static inline int access_ok(int type, const void __user *p, unsigned long size)
return __access_ok(addr, size); return __access_ok(addr, size);
} }
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
/* /*
* Uh, these should become the main single-value transfer routines ... * Uh, these should become the main single-value transfer routines ...
* They automatically use the right size if we just have the right * They automatically use the right size if we just have the right

6
include/asm-sh64/uaccess.h
View File

@@ -60,12 +60,6 @@
#define access_ok(type,addr,size) (__range_ok(addr,size) == 0) #define access_ok(type,addr,size) (__range_ok(addr,size) == 0)
#define __access_ok(addr,size) (__range_ok(addr,size) == 0) #define __access_ok(addr,size) (__range_ok(addr,size) == 0)
/* this function will go away soon - use access_ok() instead */
extern inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
/* /*
* Uh, these should become the main single-value transfer routines ... * Uh, these should become the main single-value transfer routines ...
* They automatically use the right size if we just have the right * They automatically use the right size if we just have the right

6
include/asm-sparc/uaccess.h
View File

@@ -47,12 +47,6 @@
#define access_ok(type, addr, size) \ #define access_ok(type, addr, size) \
({ (void)(type); __access_ok((unsigned long)(addr), size); }) ({ (void)(type); __access_ok((unsigned long)(addr), size); })
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

6
include/asm-sparc64/uaccess.h
View File

@@ -59,12 +59,6 @@ static inline int access_ok(int type, const void __user * addr, unsigned long si
return 1; return 1;
} }
/* this function will go away soon - use access_ok() instead */
static inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return 0;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

6
include/asm-v850/uaccess.h
View File

@@ -27,12 +27,6 @@ extern inline int access_ok (int type, const void *addr, unsigned long size)
return val >= (0x80 + NUM_CPU_IRQS*16) && val < 0xFFFFF000; return val >= (0x80 + NUM_CPU_IRQS*16) && val < 0xFFFFF000;
} }
/* this function will go away soon - use access_ok() instead */
extern inline int __deprecated verify_area (int type, const void *addr, unsigned long size)
{
return access_ok (type, addr, size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is

7
include/asm-x86_64/uaccess.h
View File

@@ -49,13 +49,6 @@
#define access_ok(type, addr, size) (__range_not_ok(addr,size) == 0) #define access_ok(type, addr, size) (__range_not_ok(addr,size) == 0)
/* this function will go away soon - use access_ok() instead */
extern inline int __deprecated verify_area(int type, const void __user * addr, unsigned long size)
{
return access_ok(type,addr,size) ? 0 : -EFAULT;
}
/* /*
* The exception table consists of pairs of addresses: the first is the * The exception table consists of pairs of addresses: the first is the
* address of an instruction that is allowed to fault, and the second is * address of an instruction that is allowed to fault, and the second is