maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault.patch removed from -mm tree
The patch titled
Subject: maccess: rename strncpy_from_unsafe_user to strncpy_from_user_nofault
has been removed from the -mm tree. Its filename was
maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: 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.
---
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(-)
include/linux/uaccess.h renamed from include/linux/uaccess.h~maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault +2 -2
@@ -313,8 +313,8 @@ extern long strncpy_from_unsafe(char *dsextern 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);/**
kernel/trace/bpf_trace.c renamed from kernel/trace/bpf_trace.c~maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault +2 -2
@@ -159,7 +159,7 @@ const struct bpf_func_proto bpf_probe_re 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 ;
kernel/trace/trace_kprobe.c renamed from kernel/trace/trace_kprobe.c~maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault +1 -1
@@ -1268,7 +1268,7 @@ fetch_store_string_user(unsigned long ad __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);
mm/maccess.c renamed from mm/maccess.c~maccess-rename-strncpy_from_unsafe_user-to-strncpy_from_user_nofault +2 -2
@@ -217,7 +217,7 @@ long __strncpy_from_unsafe(char *dst, co }/** -* 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, co* 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 ();
_
Patches currently in -mm which might be from [email protected] are
amdgpu-a-null-mm-does-not-mean-a-thread-is-a-kthread.patch kernel-move-use_mm-unuse_mm-to-kthreadc.patch kernel-move-use_mm-unuse_mm-to-kthreadc-v2.patch kernel-better-document-the-use_mm-unuse_mm-api-contract.patch kernel-better-document-the-use_mm-unuse_mm-api-contract-v2.patch kernel-set-user_ds-in-kthread_use_mm.patch