diff options
author | Andrii Nakryiko <andrii@kernel.org> | 2022-11-11 11:44:46 -0800 |
---|---|---|
committer | Andrii Nakryiko <andrii@kernel.org> | 2022-11-11 11:44:47 -0800 |
commit | c20572600e16d13d5d6a081bdc84c95491101d34 (patch) | |
tree | 09a8c1c050975d07822ecdf5fb8197be912d20c0 /mm/maccess.c | |
parent | 5704bc7e8991164b14efb748b5afa0715c25fac3 (diff) | |
parent | 9cd094829dae949a755c18533479c20e74415ab2 (diff) |
Merge branch 'Fix offset when fault occurs in strncpy_from_kernel_nofault()'
Alban Crequy says:
====================
Hi,
This is v2 of the fix & selftest previously sent at:
https://lore.kernel.org/linux-mm/20221108195211.214025-1-flaniel@linux.microsoft.com/
Changes v1 to v2:
- add 'cc:stable', 'Fixes:' and review/ack tags
- update commitmsg and fix my email
- rebase on bpf tree and tag for bpf tree
Thanks!
====================
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'mm/maccess.c')
-rw-r--r-- | mm/maccess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/maccess.c b/mm/maccess.c index 5f4d240f67ec..074f6b086671 100644 --- a/mm/maccess.c +++ b/mm/maccess.c @@ -97,7 +97,7 @@ long strncpy_from_kernel_nofault(char *dst, const void *unsafe_addr, long count) return src - unsafe_addr; Efault: pagefault_enable(); - dst[-1] = '\0'; + dst[0] = '\0'; return -EFAULT; } |