Commit 7676fbf2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

maccess: remove strncpy_from_unsafe



All users are gone now.

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


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9de1fec5
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ extern long probe_user_read(void *dst, const void __user *src, size_t size);
extern 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);

+1 −38
Original line number Diff line number Diff line
@@ -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)
@@ -157,35 +155,6 @@ long probe_user_write(void __user *dst, const void *src, size_t size)
}
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.
@@ -205,12 +174,6 @@ long strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)
 * sets the last byte of @dst buffer to NUL and returns @count.
 */
long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, long count)
{
	return __strncpy_from_unsafe(dst, unsafe_addr, count, true);
}

static long __strncpy_from_unsafe(char *dst, const void *unsafe_addr,
		long count, bool strict)
{
	mm_segment_t old_fs = get_fs();
	const void *src = unsafe_addr;
@@ -218,7 +181,7 @@ static long __strncpy_from_unsafe(char *dst, const void *unsafe_addr,

	if (unlikely(count <= 0))
		return 0;
	if (!probe_kernel_read_allowed(unsafe_addr, count, strict))
	if (!probe_kernel_read_allowed(unsafe_addr, count, true))
		return -EFAULT;

	set_fs(KERNEL_DS);