| From | Dominique Martinet <> | Subject | [PATCH 17/18] perf: change strncpy+truncation to strlcpy | Date | Fri, 13 Jul 2018 03:26:06 +0200 |
| |
Generated by scripts/coccinelle/misc/strncpy_truncation.cocci
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org> ---
Please see https://marc.info/?l=linux-kernel&m=153144450722324&w=2 (the first patch of the serie) for the motivation behind this patch
tools/perf/util/bpf-loader.h | 3 +-- tools/perf/util/util.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index 5d3aefd6fae7..8d08a1fc97a0 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -143,10 +143,9 @@ __bpf_strerror(char *buf, size_t size) { if (!size) return 0; - strncpy(buf, + strlcpy(buf, "ERROR: eBPF object loading is disabled during compiling.\n", size); - buf[size - 1] = '\0'; return 0; } diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index eac5b858a371..8b9e3aa7aad3 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -459,8 +459,7 @@ fetch_kernel_version(unsigned int *puint, char *str, return -1; if (str && str_size) { - strncpy(str, utsname.release, str_size); - str[str_size - 1] = '\0'; + strlcpy(str, utsname.release, str_size); } if (!puint || int_ver_ready) -- 2.17.1
|