Commit 02dddb16 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

maccess: rename strnlen_unsafe_user to strnlen_user_nofault 



This matches the naming of strnlen_user, and also makes it more clear
what the function is supposed to do.

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


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

include/linux/uaccess.h

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, 
extern long __strncpy_from_unsafe(char *dst, const void *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);

long strnlen_user_nofault(const void __user *unsafe_addr, long count);



/**

 * probe_kernel_address(): safely attempt to read from a location

kernel/trace/trace_kprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ fetch_store_strlen_user(unsigned long addr) 
{

	const void __user *uaddr =  (__force const void __user *)addr;



	return strnlen_unsafe_user(uaddr, MAX_STRING_SIZE);

	return strnlen_user_nofault(uaddr, MAX_STRING_SIZE);

}



/*

mm/maccess.c

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, 
}



/**

 * strnlen_unsafe_user: - Get the size of a user string INCLUDING final NUL.

 * strnlen_user_nofault: - Get the size of a user string INCLUDING final NUL.

 * @unsafe_addr: The string to measure.

 * @count: Maximum count (including NUL)

 *
@@ -275,7 +275,7 @@ long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr, 
 * Unlike strnlen_user, this can be used from IRQ handler etc. because

 * it disables pagefaults.

 */

long strnlen_unsafe_user(const void __user *unsafe_addr, long count)

long strnlen_user_nofault(const void __user *unsafe_addr, long count)

{

	mm_segment_t old_fs = get_fs();

	int ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE