perf annotate: Use zfree() to avoid possibly accessing dangling pointers
Arnaldo Carvalho de Melo
maintainerPATCH 1/1 perf annotate: Use zfree() to avoid possibly accessing dangling pointers
When freeing a->b it is good practice to set a->b to NULL using zfree(&a->b) so that when we have a bug where a reference to a freed 'a' pointer is kept somewhere, we can more quickly cause a segfault if some code tries to use a->b.
This is mostly done but some new cases were introduced recently, convert them to zfree().
Cc Adrian Hunter <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Kan Liang <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/ui/browsers/annotate-data.c | 3 ++- tools/perf/util/annotate-data.c | 17 +++++++++-------- tools/perf/util/annotate.c | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-)
tools/perf/ui/browsers/annotate-data.c +2 -1
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <inttypes.h> #include <string.h> +#include <linux/zalloc.h> #include <sys/ttydefaults.h> #include "ui/browser.h"
@@ -130,7 +131,7 @@ static void annotated_data_browser__delete_entries(struct annotated_data_browserlist_for_each_entry_safe (pos, tmp, &browser->entries, node) {list_del_init (&pos->node); -free (pos->hists); +zfree (&pos->hists);free (pos); } }
tools/perf/util/annotate-data.c +9 -8
@@ -8,6 +8,7 @@#include <stdio.h> #include <stdlib.h> #include <inttypes.h> +#include <linux/zalloc.h> #include "annotate.h" #include "annotate-data.h"
@@ -311,8 +312,8 @@ static void delete_members(struct annotated_member *member)list_for_each_entry_safe (child, tmp, &member->children, node) {list_del (&child->node);delete_members (child); -free (child->type_name); -free (child->var_name); +zfree (&child->type_name); +zfree (&child->var_name);free (child); } }
@@ -582,7 +583,7 @@ void global_var_type__tree_delete(struct rb_root *root)rb_erase (node, root); gvar = rb_entry(node, struct global_var_entry, node); -free (gvar->name); +zfree (&gvar->name);free (gvar); } }
@@ -1817,16 +1818,16 @@ static int alloc_data_type_histograms(struct annotated_data_type *adt, int nr_en err:while (--i >=0 ) -free (adt->histograms[i]); -free (adt->histograms); +zfree (&(adt->histograms[i])); +zfree (&adt->histograms);return -ENOMEM ; }static void delete_data_type_histograms (struct annotated_data_type *adt) {for (int i =0 ; i < adt->nr_histograms; i++) -free (adt->histograms[i]); -free (adt->histograms); +zfree (&(adt->histograms[i])); +zfree (&adt->histograms); }void annotated_data_type__tree_delete (struct rb_root *root)
@@ -1840,7 +1841,7 @@ void annotated_data_type__tree_delete(struct rb_root *root) pos = rb_entry(node, struct annotated_data_type, node);delete_members (&pos->self);delete_data_type_histograms (pos); -free (pos->self.type_name); +zfree (&pos->self.type_name);free (pos); } }
tools/perf/util/annotate.c +2 -2
@@ -2618,13 +2618,13 @@ static void delete_basic_blocks(struct basic_block_data *bb_data)list_for_each_entry_safe (link, tmp, &bb_data->queue, node) {list_del (&link->node); -free (link->bb); +zfree (&link->bb);free (link); }list_for_each_entry_safe (link, tmp, &bb_data->visited, node) {list_del (&link->node); -free (link->bb); +zfree (&link->bb);free (link); } }
Signature · 1 line
2.44.0