mirror of https://lore.kernel.org/lkml/
 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,
	Taeung Song <treeze.taeung@gmail.com>,
	Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Wang Nan <wangnan0@huawei.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 14/32] perf tools: Use zfree() to avoid keeping dangling pointers
Date: Thu,  9 Feb 2017 22:39:22 -0300	[thread overview]
Message-ID: <20170210013940.9998-15-acme@kernel.org> (raw)
In-Reply-To: <20170210013940.9998-1-acme@kernel.org>

From: Taeung Song <treeze.taeung@gmail.com>

The cases changed in this patch are for when we free but keep the
pointer to the freed area, which is not always a good idea.

Be more defensive and zero the pointer to avoid possible use after
free bugs to take more time to be detected.

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1485952447-7013-5-git-send-email-treeze.taeung@gmail.com
[ rewrote commit log ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/parse-events.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index ab1ba22d879a..07be0762e53e 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1479,7 +1479,7 @@ static void perf_pmu__parse_cleanup(void)
 
 		for (i = 0; i < perf_pmu_events_list_num; i++) {
 			p = perf_pmu_events_list + i;
-			free(p->symbol);
+			zfree(&p->symbol);
 		}
 		zfree(&perf_pmu_events_list);
 		perf_pmu_events_list_num = 0;
@@ -1570,7 +1570,7 @@ perf_pmu__parse_check(const char *name)
 	r = bsearch(&p, perf_pmu_events_list,
 			(size_t) perf_pmu_events_list_num,
 			sizeof(struct perf_pmu_event_symbol), comp_pmu);
-	free(p.symbol);
+	zfree(&p.symbol);
 	return r ? r->type : PMU_EVENT_SYMBOL_ERR;
 }
 
@@ -1717,8 +1717,8 @@ static void parse_events_print_error(struct parse_events_error *err,
 		fprintf(stderr, "%*s\\___ %s\n", idx + 1, "", err->str);
 		if (err->help)
 			fprintf(stderr, "\n%s\n", err->help);
-		free(err->str);
-		free(err->help);
+		zfree(&err->str);
+		zfree(&err->help);
 	}
 
 	fprintf(stderr, "Run 'perf list' for a list of valid events\n");
@@ -2413,7 +2413,7 @@ void parse_events_terms__purge(struct list_head *terms)
 
 	list_for_each_entry_safe(term, h, terms, list) {
 		if (term->array.nr_ranges)
-			free(term->array.ranges);
+			zfree(&term->array.ranges);
 		list_del_init(&term->list);
 		free(term);
 	}
@@ -2429,7 +2429,7 @@ void parse_events_terms__delete(struct list_head *terms)
 
 void parse_events__clear_array(struct parse_events_array *a)
 {
-	free(a->ranges);
+	zfree(&a->ranges);
 }
 
 void parse_events_evlist_error(struct parse_events_evlist *data,
-- 
2.9.3

  parent reply	other threads:[~2017-02-10  2:45 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-10  1:39 [GIT PULL 00/32] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 01/32] perf tools arm64: Add support for generating bpf prologue Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 02/32] perf bpf: Add missing newline in debug messages Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 03/32] perf jevents: Parse eventcode as number Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 04/32] perf jevents: Add support for parsing uncore json files Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 05/32] perf pmu: Support per pmu json aliases Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 06/32] perf pmu: Support event aliases for non cpu// pmus Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 07/32] perf list: Add debug support for outputing alias string Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 08/32] perf sdt: Show proper hint when event not yet in place via 'perf probe' Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 09/32] perf symbols: Take into account symfs setting when reading file build ID Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 10/32] perf probe: Add option --symfs Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 11/32] perf tools: Only increase index if perf_evsel__new_idx() succeeds Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 12/32] perf tools: Add missing check for failure in a zalloc() call Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 13/32] perf tools: Use zfree() instead of ad hoc equivalent Arnaldo Carvalho de Melo
2017-02-10  1:39 ` Arnaldo Carvalho de Melo [this message]
2017-02-10  1:39 ` [PATCH 15/32] tools lib traceevent: Robustify do_generate_dynamic_list_file Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 16/32] perf tools: Fix include of linux/mman.h Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 17/32] perf vendor events intel: Add uncore events for Haswell Server processor Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 18/32] perf vendor events intel: Add uncore events for Broadwell Server Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 19/32] perf vendor events intel: Add uncore events for IvyBridge Server Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 20/32] perf vendor events intel: Add uncore events for Sandy Bridge Server Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 21/32] perf vendor events intel: Add uncore events for Xeon Phi (Knights Landing) Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 22/32] perf vendor events intel: Add uncore events for Broadwell DE Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 23/32] tools lib bpf: Add missing header to the library Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 24/32] tools include: Add a __fallthrough statement Arnaldo Carvalho de Melo
2017-02-10  3:02   ` Joe Perches
2017-02-10 14:42     ` Arnaldo Carvalho de Melo
2017-02-10 17:08       ` [PATCH] compiler/compiler-gcc: Add __fallthrough Joe Perches
2017-02-10 17:18         ` Arnaldo Carvalho de Melo
2017-02-10 18:50           ` Joe Perches
     [not found]         ` <20170824133654.fnbaaj5kjtstzm42@smile.fi.intel.com>
     [not found]           ` <1503598834.12569.8.camel@perches.com>
     [not found]             ` <1503599543.25945.94.camel@intel.com>
2017-08-24 20:42               ` Joe Perches
2017-02-10  1:39 ` [PATCH 25/32] tools string: Use __fallthrough in perf_atoll() Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 26/32] tools strfilter: Use __fallthrough Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 27/32] perf top: " Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 28/32] perf thread_map: Correctly size buffer used with dirent->dt_name Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 29/32] perf header: Fix handling of PERF_EVENT_UPDATE__SCALE Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 30/32] perf bench numa: Avoid possible truncation when using snprintf() Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 31/32] perf tests: Avoid possible truncation with dirent->d_name + snprintf Arnaldo Carvalho de Melo
2017-02-10  1:39 ` [PATCH 32/32] perf intel-pt: Use __fallthrough Arnaldo Carvalho de Melo
2017-02-10  7:38 ` [GIT PULL 00/32] 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=20170210013940.9998-15-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=treeze.taeung@gmail.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

all inboxes | Powered by JetHome®