perf annotate: Prevent overflow in size calculation

A large enough symbol size causes an overflow in the size parameter to the histogram allocation, leading to a segfault in symbol__inc_addr_samples later on when this histogram is accessed. In the case of being called via perf-report, this returns back and gracefully ignores the sample, eventually ignoring the chained return value of perf_session_deliver_event in flush_sample_queue. Signed-off-by: Cody Schafer <cody@linux.vnet.ibm.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Link: http://lkml.kernel.org/r/1342753525-4521-1-git-send-email-cody@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

perf annotate: Prevent overflow in size calculation
A large enough symbol size causes an overflow in the size parameter to the histogram allocation, leading to a segfault in symbol__inc_addr_samples later on when this histogram is accessed. In the case of being called via perf-report, this returns back and gracefully ignores the sample, eventually ignoring the chained return value of perf_session_deliver_event in flush_sample_queue. Signed-off-by: Cody Schafer <cody@linux.vnet.ibm.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Link: http://lkml.kernel.org/r/1342753525-4521-1-git-send-email-cody@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cody Schafer · Arnaldo Carvalho de Melo
1 parent 52f18a2ff9
Showing 1 changed file with 12 additions and 1 deletions Side-by-side Diff
tools/perf/util/annotate.c
@@ -426,7 +426,18 @@
 {
 	struct annotation *notes = symbol__annotation(sym);
 	const size_t size = symbol__size(sym);
-	size_t sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(u64));
+	size_t sizeof_sym_hist;
+
+	/* Check for overflow when calculating sizeof_sym_hist */
+	if (size > (SIZE_MAX - sizeof(struct sym_hist)) / sizeof(u64))
+		return -1;
+
+	sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(u64));
+
+	/* Check for overflow in zalloc argument */
+	if (sizeof_sym_hist > (SIZE_MAX - sizeof(*notes->src))
+				/ symbol_conf.nr_events)
+		return -1;
  
 	notes->src = zalloc(sizeof(*notes->src) + symbol_conf.nr_events * sizeof_sym_hist);
 	if (notes->src == NULL)
...	...	@@ -426,7 +426,18 @@
426	426	{
427	427	struct annotation *notes = symbol__annotation(sym);
428	428	const size_t size = symbol__size(sym);
429		- size_t sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(u64));
	429	+ size_t sizeof_sym_hist;
	430	+
	431	+ /* Check for overflow when calculating sizeof_sym_hist */
	432	+ if (size > (SIZE_MAX - sizeof(struct sym_hist)) / sizeof(u64))
	433	+ return -1;
	434	+
	435	+ sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(u64));
	436	+
	437	+ /* Check for overflow in zalloc argument */
	438	+ if (sizeof_sym_hist > (SIZE_MAX - sizeof(*notes->src))
	439	+ / symbol_conf.nr_events)
	440	+ return -1;
430	441
431	442	notes->src = zalloc(sizeof(notes->src) + symbol_conf.nr_events sizeof_sym_hist);
432	443	if (notes->src == NULL)