aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhiyuan Dai <[email protected]>2021-04-29 22:59:43 -0700
committerLinus Torvalds <[email protected]>2021-04-30 11:20:41 -0700
commitf76e0c41c0ac7f6ae614dd50ce3e983b974b87c1 (patch)
treee6c3df2b9353c1793508a66213e0824d19398375
parent91ab1a41191ef2d4c6e123951a0f0c3876bd9376 (diff)
mm/kasan: switch from strlcpy to strscpy
strlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Zhiyuan Dai <[email protected]> Acked-by: Alexander Potapenko <[email protected]> Reviewed-by: Andrey Konovalov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--mm/kasan/report_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c
index de732bc341c5..139615ef326b 100644
--- a/mm/kasan/report_generic.c
+++ b/mm/kasan/report_generic.c
@@ -148,7 +148,7 @@ static bool __must_check tokenize_frame_descr(const char **frame_descr,
}
/* Copy token (+ 1 byte for '\0'). */
- strlcpy(token, *frame_descr, tok_len + 1);
+ strscpy(token, *frame_descr, tok_len + 1);
}
/* Advance frame_descr past separator. */