linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Alexei Starovoitov <ast@plumgrid.com>,
	Brendan Gregg <brendan.d.gregg@gmail.com>,
	Daniel Borkmann <daniel@iogearbox.net>,
	David Ahern <dsahern@gmail.com>, Jiri Olsa <jolsa@kernel.org>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	pi3orama@163.com, Zefan Li <lizefan@huawei.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 15/18] perf tools: Set vmlinux_path__nr_entries to 0 in vmlinux_path__exit
Date: Mon, 18 May 2015 12:50:38 -0300	[thread overview]
Message-ID: <1431964241-7609-16-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1431964241-7609-1-git-send-email-acme@kernel.org>

From: Wang Nan <wangnan0@huawei.com>

Original vmlinux_path__exit() doesn't revert vmlinux_path__nr_entries to
its original state. After the while loop vmlinux_path__nr_entries
becomes -1 instead of 0.

This makes a problem that, if runs twice, during the second run
vmlinux_path__init() will set vmlinux_path[-1] to strdup("vmlinux"),
corrupts random memory.

This patch reset vmlinux_path__nr_entries to 0 after the while loop.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: pi3orama@163.com
Cc: Zefan Li <lizefan@huawei.com>
Link: http://lkml.kernel.org/r/1431860222-61636-3-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/symbol.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 9ef8b8946b11..82a31fd0fcf5 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1819,6 +1819,7 @@ static void vmlinux_path__exit(void)
 {
 	while (--vmlinux_path__nr_entries >= 0)
 		zfree(&vmlinux_path[vmlinux_path__nr_entries]);
+	vmlinux_path__nr_entries = 0;
 
 	zfree(&vmlinux_path);
 }
-- 
2.1.0


  parent reply	other threads:[~2015-05-18 15:51 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-18 15:50 [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 01/18] perf tools: Use atomic.h for the map_groups refcount Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 02/18] perf machine: Stop accessing atomic_t::counter directly Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 03/18] perf evlist: Use atomic.h for the perf_mmap refcount Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 04/18] perf cgroup: Use atomic.h for refcounting Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 05/18] perf tools: Fix dwarf-aux.c compilation on i386 Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 06/18] perf tools: Fix "Command" sort_entry's cmp and collapse function Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 07/18] perf probe: Load map before glob matching Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 08/18] tools include: add __aligned_u64 to types.h Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 09/18] perf tools: Elliminate alignment holes Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 10/18] perf tools: Add rm_rf() utility function Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 11/18] perf tools: Introduce copyfile_offset() function Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 12/18] perf symbols: Protect dso symbol loading using a mutex Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 13/18] perf symbols: Protect dso cache tree using dso->lock Arnaldo Carvalho de Melo
2016-07-29 12:56   ` Bryton Lee
2016-07-29 15:09     ` Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 14/18] perf tools: Protect dso cache fd with a mutex Arnaldo Carvalho de Melo
2015-05-18 15:50 ` Arnaldo Carvalho de Melo [this message]
2015-05-18 15:50 ` [PATCH 16/18] tools lib traceevent: Install libtraceevent.a into libdir Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 17/18] tools build: Change FEATURE_TESTS and FEATURE_DISPLAY to weak binding Arnaldo Carvalho de Melo
2015-05-18 15:50 ` [PATCH 18/18] perf bench numa: Share sched_getcpu() __weak def with cloexec.c Arnaldo Carvalho de Melo
2015-05-20 11:25 ` [GIT PULL 00/18] perf/core improvements and fixes 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=1431964241-7609-16-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=ast@plumgrid.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=dsahern@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@kernel.org \
    --cc=paulus@samba.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).