diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-12-06 10:49:46 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-12 19:47:11 +0100 |
| commit | d177e25c9c3a16c06ce697daa6c6720f2800cfbd (patch) | |
| tree | 530bcbb4a3a5286b573955113835f396821bc1ac /tools/perf/util/dso.c | |
| parent | 630e972bc405dfcf5897ca9241bae3b6be1f5740 (diff) | |
| download | linux-stable-d177e25c9c3a16c06ce697daa6c6720f2800cfbd.tar.gz linux-stable-d177e25c9c3a16c06ce697daa6c6720f2800cfbd.tar.bz2 linux-stable-d177e25c9c3a16c06ce697daa6c6720f2800cfbd.zip | |
perf dso: Fix unchecked usage of strncpy()
[ Upstream commit fca5085c15255bbde203b7322c15f07ebb12f63e ]
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:
In function 'decompress_kmodule',
inlined from 'dso__decompress_kmodule_fd' at util/dso.c:305:9:
util/dso.c:298:3: error: 'strncpy' destination unchanged after copying no bytes [-Werror=stringop-truncation]
strncpy(pathname, tmpbuf, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
CC /tmp/build/perf/util/values.o
CC /tmp/build/perf/util/debug.o
cc1: all warnings being treated as errors
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Fixes: c9a8a6131fb6 ("perf tools: Move the temp file processing into decompress_kmodule")
Link: https://lkml.kernel.org/n/tip-tl2hdxj64tt4k8btbi6a0ugw@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools/perf/util/dso.c')
| -rw-r--r-- | tools/perf/util/dso.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index bbed90e5d9bb..cee717a3794f 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -295,7 +295,7 @@ static int decompress_kmodule(struct dso *dso, const char *name, unlink(tmpbuf); if (pathname && (fd >= 0)) - strncpy(pathname, tmpbuf, len); + strlcpy(pathname, tmpbuf, len); return fd; } |