whack-a-mole: kill strlen_user() (again)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
eecf77e097
commit
a0d8d55278
|
@ -397,8 +397,6 @@ long __strncpy_from_user(char *dst, const char *src, long count);
|
|||
*/
|
||||
long strnlen_user(const char *src, long n);
|
||||
|
||||
#define strlen_user(str) strnlen_user(str, 32767)
|
||||
|
||||
struct exception_table_entry {
|
||||
unsigned long insn;
|
||||
unsigned long nextinsn;
|
||||
|
|
|
@ -116,7 +116,7 @@ long strncpy_from_user(char *dst, const char *src, long count)
|
|||
EXPORT_SYMBOL(strncpy_from_user);
|
||||
|
||||
/*
|
||||
* strlen_user: - Get the size of a string in user space.
|
||||
* strnlen_user: - Get the size of a string in user space.
|
||||
* @str: The string to measure.
|
||||
* @n: The maximum valid length
|
||||
*
|
||||
|
|
|
@ -260,7 +260,6 @@ do { \
|
|||
|
||||
extern unsigned long __arch_clear_user(void __user * addr, unsigned long n);
|
||||
extern long strncpy_from_user(char *dest, const char __user * src, long count);
|
||||
extern __must_check long strlen_user(const char __user * str);
|
||||
extern __must_check long strnlen_user(const char __user * str, long n);
|
||||
extern unsigned long __arch_copy_from_user(void *to, const void __user * from,
|
||||
unsigned long n);
|
||||
|
|
|
@ -83,7 +83,6 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n);
|
|||
|
||||
extern long strncpy_from_user(char *__to, const char __user *__from,
|
||||
long __len);
|
||||
extern __must_check long strlen_user(const char __user *str);
|
||||
extern __must_check long strnlen_user(const char __user *s, long n);
|
||||
|
||||
/* Optimized macros */
|
||||
|
|
|
@ -372,7 +372,6 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n)
|
|||
|
||||
extern long strncpy_from_user(char *dest, const char __user *src, long count);
|
||||
|
||||
extern long __must_check strlen_user(const char __user *str);
|
||||
extern long __must_check strnlen_user(const char __user *str, long n);
|
||||
|
||||
extern
|
||||
|
|
Loading…
Reference in New Issue