Commit 02dddb16 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

maccess: rename strnlen_unsafe_user to strnlen_user_nofault

This matches the naming of strnlen_user, and also makes it more clear
what the function is supposed to do.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20200521152301.2587579-9-hch@lst.deSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c4cb1644
...@@ -315,7 +315,7 @@ long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, ...@@ -315,7 +315,7 @@ long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr,
extern long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count); extern long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count);
long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr,
long count); long count);
extern long strnlen_unsafe_user(const void __user *unsafe_addr, long count); long strnlen_user_nofault(const void __user *unsafe_addr, long count);
/** /**
* probe_kernel_address(): safely attempt to read from a location * probe_kernel_address(): safely attempt to read from a location
......
...@@ -1221,7 +1221,7 @@ fetch_store_strlen_user(unsigned long addr) ...@@ -1221,7 +1221,7 @@ fetch_store_strlen_user(unsigned long addr)
{ {
const void __user *uaddr = (__force const void __user *)addr; const void __user *uaddr = (__force const void __user *)addr;
return strnlen_unsafe_user(uaddr, MAX_STRING_SIZE); return strnlen_user_nofault(uaddr, MAX_STRING_SIZE);
} }
/* /*
......
...@@ -260,7 +260,7 @@ long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, ...@@ -260,7 +260,7 @@ long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr,
} }
/** /**
* strnlen_unsafe_user: - Get the size of a user string INCLUDING final NUL. * strnlen_user_nofault: - Get the size of a user string INCLUDING final NUL.
* @unsafe_addr: The string to measure. * @unsafe_addr: The string to measure.
* @count: Maximum count (including NUL) * @count: Maximum count (including NUL)
* *
...@@ -275,7 +275,7 @@ long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, ...@@ -275,7 +275,7 @@ long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr,
* Unlike strnlen_user, this can be used from IRQ handler etc. because * Unlike strnlen_user, this can be used from IRQ handler etc. because
* it disables pagefaults. * it disables pagefaults.
*/ */
long strnlen_unsafe_user(const void __user *unsafe_addr, long count) long strnlen_user_nofault(const void __user *unsafe_addr, long count)
{ {
mm_segment_t old_fs = get_fs(); mm_segment_t old_fs = get_fs();
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment