diff options
author | Ingo Molnar <mingo@kernel.org> | 2020-03-19 14:59:10 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2020-03-19 14:59:10 +0100 |
commit | db5d85ce82487331b06ec0e076b85b5a3968bf53 (patch) | |
tree | 66eb917c0e00a62dccbc87536985462b54204f02 /tools/perf/util/map.c | |
parent | ac309e7744bee222df6de0122facaf2d9706fa70 (diff) | |
parent | 1efde2754275dbd9d11c6e0132a4f09facf297ab (diff) |
Merge tag 'perf-urgent-for-mingo-5.6-20200309' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
perf probe:
Masami Hiramatsu:
- Fix deletion of multiple probe events.
- Fix userspace libraries handling by not depending on dwfl_module_addrsym().
Event parsing:
Ian Rogers:
- Fix reading of invalid memory in event parsing.
python binding:
Ilie Halip:
- Fix clang detection when using CC=clang-version.
build:
Masami Hiramatsu:
- Fix O= use with relative paths.
Android:
Dominik b. Czarnota:
- Fix off by one in strncpy() size argument when handling Android
libraries.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/map.c')
-rw-r--r-- | tools/perf/util/map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 95428511300d..b342f744b1fc 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -89,7 +89,7 @@ static inline bool replace_android_lib(const char *filename, char *newfilename) return true; } - if (!strncmp(filename, "/system/lib/", 11)) { + if (!strncmp(filename, "/system/lib/", 12)) { char *ndk, *app; const char *arch; size_t ndk_length; |