[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-c4f035473d93c1594d8225f6dd97332317820801@git.kernel.org>
Date: Wed, 20 May 2015 05:25:56 -0700
From: tip-bot for Wang Nan <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: namhyung@...nel.org, daniel@...earbox.net,
masami.hiramatsu.pt@...achi.com, acme@...hat.com, hpa@...or.com,
mingo@...nel.org, dsahern@...il.com, lizefan@...wei.com,
jolsa@...nel.org, linux-kernel@...r.kernel.org,
wangnan0@...wei.com, tglx@...utronix.de, a.p.zijlstra@...llo.nl,
brendan.d.gregg@...il.com, paulus@...ba.org
Subject: [tip:perf/core] perf tools:
Set vmlinux_path__nr_entries to 0 in vmlinux_path__exit
Commit-ID: c4f035473d93c1594d8225f6dd97332317820801
Gitweb: http://git.kernel.org/tip/c4f035473d93c1594d8225f6dd97332317820801
Author: Wang Nan <wangnan0@...wei.com>
AuthorDate: Sun, 17 May 2015 10:56:27 +0000
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 18 May 2015 10:17:39 -0300
perf tools: Set vmlinux_path__nr_entries to 0 in vmlinux_path__exit
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@...wei.com>
Acked-by: Namhyung Kim <namhyung@...nel.org>
Cc: Alexei Starovoitov <ast@...mgrid.com
Cc: Brendan Gregg <brendan.d.gregg@...il.com>
Cc: Daniel Borkmann <daniel@...earbox.net>
Cc: David Ahern <dsahern@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: pi3orama@....com
Cc: Zefan Li <lizefan@...wei.com>
Link: http://lkml.kernel.org/r/1431860222-61636-3-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.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 9ef8b89..82a31fd 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);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists