[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-ae450a7d054cd1fe8d003a085858ca5b90cc74d9@git.kernel.org>
Date: Tue, 15 Apr 2014 10:30:30 -0700
From: tip-bot for Adrian Hunter <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
adrian.hunter@...el.com, tglx@...utronix.de, jolsa@...hat.com
Subject: [tip:perf/urgent] perf tools: Fix double free in perf test 21 (
code-reading.c)
Commit-ID: ae450a7d054cd1fe8d003a085858ca5b90cc74d9
Gitweb: http://git.kernel.org/tip/ae450a7d054cd1fe8d003a085858ca5b90cc74d9
Author: Adrian Hunter <adrian.hunter@...el.com>
AuthorDate: Thu, 10 Apr 2014 12:02:54 +0300
Committer: Jiri Olsa <jolsa@...hat.com>
CommitDate: Tue, 15 Apr 2014 13:57:14 +0200
perf tools: Fix double free in perf test 21 (code-reading.c)
perf_evlist__delete() deletes attached cpu and thread maps
but the test is still using them, so remove them from the
evlist before deleting it.
Signed-off-by: Adrian Hunter <adrian.hunter@...el.com>
Link: http://lkml.kernel.org/r/53465E3E.8070201@intel.com
Signed-off-by: Jiri Olsa <jolsa@...hat.com>
---
tools/perf/tests/code-reading.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 653a8fe..bfb1869 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -504,6 +504,7 @@ static int do_test_code_reading(bool try_kcore)
if (ret < 0) {
if (!excl_kernel) {
excl_kernel = true;
+ perf_evlist__set_maps(evlist, NULL, NULL);
perf_evlist__delete(evlist);
evlist = NULL;
continue;
--
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