lkml.org 
[lkml]   [2020]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/23] maccess: rename strncpy_from_unsafe_user to strncpy_from_user_nofault
    Date
    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>
    ---
    include/linux/uaccess.h | 4 ++--
    kernel/trace/bpf_trace.c | 4 ++--
    kernel/trace/trace_kprobe.c | 2 +-
    mm/maccess.c | 4 ++--
    4 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
    index 5a36a298a85f8..b983cb1c1216a 100644
    --- 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 a010edc37ee02..4e20bf1d95832 100644
    --- a/kernel/trace/bpf_trace.c
    +++ b/kernel/trace/bpf_trace.c
    @@ -159,7 +159,7 @@ static 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);
    @@ -416,7 +416,7 @@ BPF_CALL_5(bpf_trace_printk, char *, fmt, u32, fmt_size, u64, arg1,
    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 35989383ae113..d600f41fda1ca 100644
    --- 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 65880ba2ca376..457d8f9bf714f 100644
    --- a/mm/maccess.c
    +++ b/mm/maccess.c
    @@ -215,7 +215,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.
    @@ -232,7 +232,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();
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-05-21 17:26    [W:3.042 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site