Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 22:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Blackfin: Annotate strnlen_user and strlen_user 'src' parameter with __user

Browse Source 
The 'src' parameter of strnlen_user and strlen_user is supposed to take a
userspace pointer, so annotate it with __user. This fixes the following and
similar sparse warnings:

	fs/binfmt_elf_fdpic.c:671:36: warning: incorrect type in argument 1 (different address spaces)
	fs/binfmt_elf_fdpic.c:671:36:    expected char const *src
	fs/binfmt_elf_fdpic.c:671:36:    got char [noderef] <asn:1>*[assigned] p
	fs/binfmt_elf_fdpic.c:683:36: warning: incorrect type in argument 1 (different address spaces)
	fs/binfmt_elf_fdpic.c:683:36:    expected char const *src
	fs/binfmt_elf_fdpic.c:683:36:    got char [noderef] <asn:1>*[assigned] p

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Bob Liu <lliubbo@gmail.com>
This commit is contained in:
Lars-Peter Clausen 2012-10-22 16:09:05 +02:00 committed by Bob Liu
parent 10dc42b5b2
commit 2a7e0775d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/blackfin/include/asm/uaccess.h
View File

@ -237,18 +237,18 @@ strncpy_from_user(char *dst, const char __user *src, long count)
* On exception, returns 0.
* If the string is too long, returns a value greater than n.
*/
static inline long __must_check strnlen_user(const char *src, long n)
static inline long __must_check strnlen_user(const char __user *src, long n)
{
if (!access_ok(VERIFY_READ, src, 1))
return 0;
return strnlen(src, n) + 1;
return strnlen((const char __force *)src, n) + 1;
}
static inline long __must_check strlen_user(const char *src)
static inline long __must_check strlen_user(const char __user *src)
{
if (!access_ok(VERIFY_READ, src, 1))
return 0;
return strlen(src) + 1;
return strlen((const char __force *)src) + 1;
}
/*