Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5c8a26c authored by Ian Rogers's avatar Ian Rogers Committed by Greg Kroah-Hartman
Browse files

perf hist: Fix memory leak of a perf_hpp_fmt 



[ Upstream commit 0ca1f534a776cc7d42f2c33da4732b74ec2790cd ]

perf_hpp__column_unregister() removes an entry from a list but doesn't
free the memory causing a memory leak spotted by leak sanitizer.

Add the free while at the same time reducing the scope of the function
to static.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lore.kernel.org/lkml/20211118071247.2140392-1-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ae3c30ca

tools/perf/ui/hist.c

+14 −14
Original line number Diff line number Diff line
@@ -468,6 +468,18 @@ struct perf_hpp_list perf_hpp_list = { 
#undef __HPP_SORT_ACC_FN

#undef __HPP_SORT_RAW_FN



static void fmt_free(struct perf_hpp_fmt *fmt)

{

	/*

	 * At this point fmt should be completely

	 * unhooked, if not it's a bug.

	 */

	BUG_ON(!list_empty(&fmt->list));

	BUG_ON(!list_empty(&fmt->sort_list));



	if (fmt->free)

		fmt->free(fmt);

}



void perf_hpp__init(void)

{
@@ -531,9 +543,10 @@ void perf_hpp_list__prepend_sort_field(struct perf_hpp_list *list, 
	list_add(&format->sort_list, &list->sorts);

}



void perf_hpp__column_unregister(struct perf_hpp_fmt *format)

static void perf_hpp__column_unregister(struct perf_hpp_fmt *format)

{

	list_del_init(&format->list);

	fmt_free(format);

}



void perf_hpp__cancel_cumulate(void)
@@ -605,19 +618,6 @@ void perf_hpp__append_sort_keys(struct perf_hpp_list *list) 
}





static void fmt_free(struct perf_hpp_fmt *fmt)

{

	/*

	 * At this point fmt should be completely

	 * unhooked, if not it's a bug.

	 */

	BUG_ON(!list_empty(&fmt->list));

	BUG_ON(!list_empty(&fmt->sort_list));



	if (fmt->free)

		fmt->free(fmt);

}



void perf_hpp__reset_output_field(struct perf_hpp_list *list)

{

	struct perf_hpp_fmt *fmt, *tmp;

tools/perf/util/hist.h

+0 −1
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ enum { 
};



void perf_hpp__init(void);

void perf_hpp__column_unregister(struct perf_hpp_fmt *format);

void perf_hpp__cancel_cumulate(void);

void perf_hpp__setup_output_field(struct perf_hpp_list *list);

void perf_hpp__reset_output_field(struct perf_hpp_list *list);