maccess: rename strncpy_from_unsafe_user to strncpy_from_user_nofault

This matches the naming of strncpy_from_user, and also makes it more
clear what the function is supposed to do.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew 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-7-hch@lst.de
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
index 4f4622b..d1a4fa6 100644 (file)
--- a/include/linux/uaccess.h
+++ b/include/linux/uaccess.h
@@ -313,8 +313,8 @@ extern long strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count);
 extern long strncpy_from_unsafe_strict(char *dst, const void *unsafe_addr,
                                       long count);
 extern long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count);
-extern long strncpy_from_unsafe_user(char *dst, const void __user *unsafe_addr,
-                                    long count);
+long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr,
+               long count);
 extern long strnlen_unsafe_user(const void __user *unsafe_addr, long count);
 
 /**

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 3744372..334db5a 100644 (file)
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -159,7 +159,7 @@ const struct bpf_func_proto bpf_probe_read_user_proto = {
 BPF_CALL_3(bpf_probe_read_user_str, void *, dst, u32, size,
           const void __user *, unsafe_ptr)
 {
-       int ret = strncpy_from_unsafe_user(dst, unsafe_ptr, size);
+       int ret = strncpy_from_user_nofault(dst, unsafe_ptr, size);
 
        if (unlikely(ret < 0))
                memset(dst, 0, size);
@@ -419,7 +419,7 @@ fmt_str:
                                                           sizeof(buf));
                                break;
                        case 'u':
-                               strncpy_from_unsafe_user(buf,
+                               strncpy_from_user_nofault(buf,
                                        (__force void __user *)unsafe_ptr,
                                                         sizeof(buf));
                                break;

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 3598938..d600f41 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -1268,7 +1268,7 @@ fetch_store_string_user(unsigned long addr, void *dest, void *base)
 
        __dest = get_loc_data(dest, base);
 
-       ret = strncpy_from_unsafe_user(__dest, uaddr, maxlen);
+       ret = strncpy_from_user_nofault(__dest, uaddr, maxlen);
        if (ret >= 0)
                *(u32 *)dest = make_data_loc(ret, __dest - base);
 

diff --git a/mm/maccess.c b/mm/maccess.c
index b3e15a8..41a494e 100644 (file)
--- a/mm/maccess.c
+++ b/mm/maccess.c
@@ -217,7 +217,7 @@ long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)
 }
 
 /**
- * strncpy_from_unsafe_user: - Copy a NUL terminated string from unsafe user
+ * strncpy_from_user_nofault: - Copy a NUL terminated string from unsafe user
  *                             address.
  * @dst:   Destination address, in kernel space.  This buffer must be at
  *         least @count bytes long.
@@ -234,7 +234,7 @@ long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)
  * If @count is smaller than the length of the string, copies @count-1 bytes,
  * sets the last byte of @dst buffer to NUL and returns @count.
  */
-long strncpy_from_unsafe_user(char *dst, const void __user *unsafe_addr,
+long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr,
                              long count)
 {
        mm_segment_t old_fs = get_fs();