From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Wang Nan <wangnan0@huawei.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Zefan Li <lizefan@huawei.com>,
pi3orama@163.com, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 08/24] perf tools: Fix crash in build_id_cache__kallsyms_path()
Date: Tue, 7 Jun 2016 17:04:46 -0300 [thread overview]
Message-ID: <1465329902-11069-9-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1465329902-11069-1-git-send-email-acme@kernel.org>
From: Wang Nan <wangnan0@huawei.com>
build_id_cache__kallsyms_path() accepts a string buffer but also allocs
a buffer using asnprintf. Unfortunately, the its only user passes it a
stack-allocated buffer. Freeing it causes crashes like this:
$ perf script
*** Error in `/home/wangnan/perf': free(): invalid pointer: 0x00007fffffff9630 ***
======= Backtrace: =========
lib64/libc.so.6(+0x6eeef)[0x7ffff5dbaeef]
lib64/libc.so.6(+0x78cae)[0x7ffff5dc4cae]
lib64/libc.so.6(+0x79987)[0x7ffff5dc5987]
/home/w00229757/perf(build_id_cache__kallsyms_path+0x6b)[0x49681b]
/home/w00229757/perf[0x4bdd40]
/home/w00229757/perf(dso__load+0xa3a)[0x4c048a]
/home/w00229757/perf(map__load+0x6f)[0x4d561f]
/home/w00229757/perf(thread__find_addr_map+0x235)[0x49e935]
/home/w00229757/perf(machine__resolve+0x7d)[0x49ec6d]
/home/w00229757/perf[0x4555a8]
/home/w00229757/perf[0x4d9507]
/home/w00229757/perf[0x4d9e80]
/home/w00229757/perf(ordered_events__flush+0x354)[0x4dd444]
/home/w00229757/perf(perf_session__process_events+0x3d0)[0x4dc140]
/home/w00229757/perf(cmd_script+0x12b0)[0x4592e0]
/home/w00229757/perf[0x4911f1]
/home/w00229757/perf(main+0x68f)[0x4352ef]
/lib64/libc.so.6(__libc_start_main+0xf5)[0x7ffff5d6dbd5]
/home/w00229757/perf[0x435415]
======= Memory map: ========
This patch simplifies build_id_cache__kallsyms_path(), not even
considering allocating a string buffer, so never frees anything. Its
caller should manage memory allocation.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Fixes: 01412261d994 ("perf buildid-cache: Use path/to/bin/buildid/elf instead of path/to/bin/buildid")
Link: http://lkml.kernel.org/r/1465271678-7392-1-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/build-id.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index 67f986c8c378..20aef90bf194 100644
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -147,20 +147,17 @@ static int asnprintf(char **strp, size_t size, const char *fmt, ...)
char *build_id_cache__kallsyms_path(const char *sbuild_id, char *bf,
size_t size)
{
- bool is_alloc = !!bf;
bool retry_old = true;
- asnprintf(&bf, size, "%s/%s/%s/kallsyms",
- buildid_dir, DSO__NAME_KALLSYMS, sbuild_id);
+ snprintf(bf, size, "%s/%s/%s/kallsyms",
+ buildid_dir, DSO__NAME_KALLSYMS, sbuild_id);
retry:
if (!access(bf, F_OK))
return bf;
- if (is_alloc)
- free(bf);
if (retry_old) {
/* Try old style kallsyms cache */
- asnprintf(&bf, size, "%s/%s/%s",
- buildid_dir, DSO__NAME_KALLSYMS, sbuild_id);
+ snprintf(bf, size, "%s/%s/%s",
+ buildid_dir, DSO__NAME_KALLSYMS, sbuild_id);
retry_old = false;
goto retry;
}
--
2.5.5
next prev parent reply other threads:[~2016-06-07 20:06 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 20:04 [GIT PULL 00/24] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 01/24] tools lib bpf: Use IS_ERR() reporting macros with bpf_map__get_private() Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 02/24] tools lib bpf: Rename bpf_map__get_name() to bpf_map__name() Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 03/24] tools lib bpf: Use IS_ERR() reporting macros with bpf_map__get_def() Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 04/24] tools lib bpf: Rename bpf_map__get_fd() to bpf_map__fd() Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 05/24] tools lib bpf: Remove _get_ from non-refcount method names Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 06/24] tools lib bpf: Make bpf_program__get_private() use IS_ERR() Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 07/24] tools lib bpf: Rename set_private() to set_priv() Arnaldo Carvalho de Melo
2016-06-07 20:04 ` Arnaldo Carvalho de Melo [this message]
2016-06-07 20:04 ` [PATCH 09/24] perf config: Constructor should free its allocated memory when failing Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 10/24] perf config: Use new perf_config_set__init() to initialize config set Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 11/24] perf unwind: Use LIBUNWIND_DIR for remote libunwind feature check Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 12/24] perf unwind: Decouple thread->address_space on libunwind Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 13/24] perf unwind: Introduce 'struct unwind_libunwind_ops' for local unwind Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 14/24] perf unwind: Move unwind__prepare_access from thread_new into thread__insert_map Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 15/24] perf unwind: Don't mix LIBUNWIND_LIBS into LIBUNWIND_LDFLAGS Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 16/24] perf unwind: Separate local/remote libunwind config Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 17/24] perf unwind: Rename unwind-libunwind.c to unwind-libunwind-local.c Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 18/24] perf tools: Extract common API out of unwind-libunwind-local.c Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 19/24] perf tools: Export normalize_arch() function Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 20/24] perf unwind: Check the target platform before assigning unwind methods Arnaldo Carvalho de Melo
2016-06-07 20:04 ` [PATCH 21/24] perf unwind: Change fixed name of libunwind__arch_reg_id to macro Arnaldo Carvalho de Melo
2016-06-07 20:05 ` [PATCH 22/24] perf unwind: Introduce flag to separate local/remote unwind compilation Arnaldo Carvalho de Melo
2016-06-07 20:05 ` [PATCH 23/24] perf callchain: Support x86 target platform Arnaldo Carvalho de Melo
2016-06-07 20:05 ` [PATCH 24/24] perf callchain: Support aarch64 cross-platform Arnaldo Carvalho de Melo
2016-06-07 23:10 ` [GIT PULL 00/24] perf/core improvements and fixes Taeung Song
2016-06-08 13:09 ` Arnaldo Carvalho de Melo
2016-06-08 7:43 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465329902-11069-9-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=mhiramat@kernel.org \
--cc=mingo@kernel.org \
--cc=pi3orama@163.com \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).