Commit 48c49c0e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

maccess: remove various unused weak aliases 



maccess tends to define lots of underscore prefixed symbols that then
have other weak aliases.  But except for two cases they are never
actually used, so remove them.

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-3-hch@lst.de


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0493cb08

include/linux/uaccess.h

+0 −3
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ extern long __probe_kernel_read(void *dst, const void *src, size_t size); 
 * happens, handle that and return -EFAULT.

 */

extern long probe_user_read(void *dst, const void __user *src, size_t size);

extern long __probe_user_read(void *dst, const void __user *src, size_t size);



/*

 * probe_kernel_write(): safely attempt to write to a location
@@ -336,7 +335,6 @@ extern long __probe_user_read(void *dst, const void __user *src, size_t size); 
 * happens, handle that and return -EFAULT.

 */

extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);

extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);



/*

 * probe_user_write(): safely attempt to write to a location in user space
@@ -348,7 +346,6 @@ extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size 
 * happens, handle that and return -EFAULT.

 */

extern long notrace probe_user_write(void __user *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);

extern long strncpy_from_unsafe_strict(char *dst, const void *unsafe_addr,

mm/maccess.c

+3 −16
Original line number Diff line number Diff line
@@ -79,11 +79,7 @@ EXPORT_SYMBOL_GPL(probe_kernel_read); 
 * Safely read from user address @src to the buffer at @dst. If a kernel fault

 * happens, handle that and return -EFAULT.

 */



long __weak probe_user_read(void *dst, const void __user *src, size_t size)

    __attribute__((alias("__probe_user_read")));



long __probe_user_read(void *dst, const void __user *src, size_t size)

long probe_user_read(void *dst, const void __user *src, size_t size)

{

	long ret = -EFAULT;

	mm_segment_t old_fs = get_fs();
@@ -106,11 +102,7 @@ EXPORT_SYMBOL_GPL(probe_user_read); 
 * Safely write to address @dst from the buffer at @src.  If a kernel fault

 * happens, handle that and return -EFAULT.

 */



long __weak probe_kernel_write(void *dst, const void *src, size_t size)

    __attribute__((alias("__probe_kernel_write")));



long __probe_kernel_write(void *dst, const void *src, size_t size)

long probe_kernel_write(void *dst, const void *src, size_t size)

{

	long ret;

	mm_segment_t old_fs = get_fs();
@@ -131,11 +123,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size) 
 * Safely write to address @dst from the buffer at @src.  If a kernel fault

 * happens, handle that and return -EFAULT.

 */



long __weak probe_user_write(void __user *dst, const void *src, size_t size)

    __attribute__((alias("__probe_user_write")));



long __probe_user_write(void __user *dst, const void *src, size_t size)

long probe_user_write(void __user *dst, const void *src, size_t size)

{

	long ret = -EFAULT;

	mm_segment_t old_fs = get_fs();
@@ -172,7 +160,6 @@ EXPORT_SYMBOL_GPL(probe_user_write); 
 * probing memory on a user address range where strncpy_from_unsafe_user() is

 * supposed to be used instead.

 */



long __weak strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)

    __attribute__((alias("__strncpy_from_unsafe")));