maccess-remove-strncpy_from_unsafe.patch removed from -mm tree
The patch titled
Subject: maccess: remove strncpy_from_unsafe
has been removed from the -mm tree. Its filename was
maccess-remove-strncpy_from_unsafe.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Christoph Hellwig <[email protected]>
Subject: maccess: remove strncpy_from_unsafe
All users are gone now.
Signed-off-by Christoph Hellwig <[email protected]>
Cc Alexei Starovoitov <[email protected]>
Cc Daniel Borkmann <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/uaccess.h | 1 mm/maccess.c | 39 -------------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-)
include/linux/uaccess.h renamed from include/linux/uaccess.h~maccess-remove-strncpy_from_unsafe +0 -1
@@ -311,7 +311,6 @@ extern long probe_user_read(void *dst, cextern long notrace probe_kernel_write (void *dst,const void *src,size_t size);extern long notrace probe_user_write (void __user *dst,const void *src,size_t size); -extern long strncpy_from_unsafe (char *dst,const void *unsafe_addr,long count);long strncpy_from_kernel_nofault (char *dst,const void *unsafe_addr,long count);
mm/maccess.c renamed from mm/maccess.c~maccess-remove-strncpy_from_unsafe +0 -33
@@ -8,8 +8,6 @@static long __probe_kernel_read (void *dst,const void *src,size_t size,bool strict); -static long __strncpy_from_unsafe (char *dst,const void *unsafe_addr, -long count,bool strict);bool __weak probe_kernel_read_allowed (const void *unsafe_src,size_t size,bool strict)
@@ -158,35 +156,6 @@ long probe_user_write(void __user *dst,EXPORT_SYMBOL_GPL (probe_user_write);/** -* strncpy_from_unsafe: - Copy a NUL terminated string from unsafe address. -* @dst: Destination address, in kernel space. This buffer must be at -* least @count bytes long. -* @unsafe_addr: Unsafe address. -* @count: Maximum number of bytes to copy, including the trailing NUL. -* -* Copies a NUL-terminated string from unsafe address to kernel buffer. -* -* On success, returns the length of the string INCLUDING the trailing NUL. -* -* If access fails, returns -EFAULT (some data may have been copied -* and the trailing NUL added). -* -* 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. -* -* Same as strncpy_from_kernel_nofault() except that for architectures with -* not fully separated user and kernel address spaces this function also works -* for user address tanges. -* -* DO NOT USE THIS FUNCTION - it is broken on architectures with entirely -* separate kernel and user address spaces, and also a bad idea otherwise. -*/ -long strncpy_from_unsafe (char *dst,const void *unsafe_addr,long count) -{ -return __strncpy_from_unsafe (dst, unsafe_addr, count, false); -} - -/** * strncpy_from_kernel_nofault: - Copy a NUL terminated string from unsafe * address. * @dst: Destination address, in kernel space. This buffer must be at
@@ -206,19 +175,13 @@ long strncpy_from_unsafe(char *dst, cons*/ long strncpy_from_kernel_nofault (char *dst,const void *unsafe_addr,long count) { -return __strncpy_from_unsafe (dst, unsafe_addr, count, true); -}