diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-12-06 11:09:46 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-03 13:15:57 +0200 |
| commit | 2a2e3b98fc00d4a1b0231173cf33b553e848895f (patch) | |
| tree | fc36059965f6d6bc8c42af92897e9586967bfd2e | |
| parent | 449a549b51c4f79e8df8469ab13248e0e53decf4 (diff) | |
| download | linux-stable-2a2e3b98fc00d4a1b0231173cf33b553e848895f.tar.gz linux-stable-2a2e3b98fc00d4a1b0231173cf33b553e848895f.tar.bz2 linux-stable-2a2e3b98fc00d4a1b0231173cf33b553e848895f.zip | |
perf header: Fix unchecked usage of strncpy()
commit 5192bde7d98c99f2cd80225649e3c2e7493722f7 upstream.
The strncpy() function may leave the destination string buffer
unterminated, better use strlcpy() that we have a __weak fallback
implementation for systems without it.
This fixes this warning on an Alpine Linux Edge system with gcc 8.2:
util/header.c: In function 'perf_event__synthesize_event_update_name':
util/header.c:3625:2: error: 'strncpy' output truncated before terminating nul copying as many bytes from a string as its length [-Werror=stringop-truncation]
strncpy(ev->data, evsel->name, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
util/header.c:3618:15: note: length computed here
size_t len = strlen(evsel->name);
^~~~~~~~~~~~~~~~~~~
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Fixes: a6e5281780d1 ("perf tools: Add event_update event unit type")
Link: https://lkml.kernel.org/n/tip-wycz66iy8dl2z3yifgqf894p@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | tools/perf/util/header.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 696f2654826b..f11cead6a151 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3171,7 +3171,7 @@ perf_event__synthesize_event_update_name(struct perf_tool *tool, if (ev == NULL) return -ENOMEM; - strncpy(ev->data, evsel->name, len); + strlcpy(ev->data, evsel->name, len + 1); err = process(tool, (union perf_event*) ev, NULL, NULL); free(ev); return err; |