mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
UPSTREAM: maccess: rename strncpy_from_unsafe_strict to strncpy_from_kernel_nofault
This matches the naming of strncpy_from_user_nofault, and also makes it more clear what the function is supposed to do. Change-Id: I862c2c72cbc36c67e35434dc29cfc00fee3abd14 Signed-off-by: Christoph Hellwig <[email protected]> Signed-off-by: Andrew Morton <[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]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
850f829a45
commit
5249357875
4 changed files with 8 additions and 8 deletions
|
|
@ -174,7 +174,7 @@ EXPORT_SYMBOL_GPL(probe_user_write);
|
|||
* 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_unsafe_strict() except that for architectures with
|
||||
* 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.
|
||||
*
|
||||
|
|
@ -186,7 +186,7 @@ long __weak strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)
|
|||
__attribute__((alias("__strncpy_from_unsafe")));
|
||||
|
||||
/**
|
||||
* strncpy_from_unsafe_strict: - Copy a NUL terminated string from unsafe
|
||||
* strncpy_from_kernel_nofault: - Copy a NUL terminated string from unsafe
|
||||
* address.
|
||||
* @dst: Destination address, in kernel space. This buffer must be at
|
||||
* least @count bytes long.
|
||||
|
|
@ -203,7 +203,7 @@ long __weak strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)
|
|||
* 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 __weak strncpy_from_unsafe_strict(char *dst, const void *unsafe_addr,
|
||||
long __weak strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr,
|
||||
long count)
|
||||
__attribute__((alias("__strncpy_from_unsafe")));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue