From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752966Ab2GTCuM (ORCPT ); Thu, 19 Jul 2012 22:50:12 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:57616 "EHLO e33.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752592Ab2GTCuK (ORCPT ); Thu, 19 Jul 2012 22:50:10 -0400 From: Cody Schafer To: Namhyung Kim Cc: Arnaldo Carvalho de Melo , Ingo Molnar , Paul Mackerras , Peter Zijlstra , Sukadev Bhattiprolu , LKML , Cody Schafer Subject: [PATCH v2] perf: prevent overflow in size calculation Date: Thu, 19 Jul 2012 19:49:12 -0700 Message-Id: <1342752552-3065-1-git-send-email-cody@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <87a9yv2r5q.fsf@sejong.aot.lge.com> References: <87a9yv2r5q.fsf@sejong.aot.lge.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12072002-2398-0000-0000-000008A3F83E Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- tools/perf/util/annotate.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 8069dfb..73a1919 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -426,7 +426,18 @@ int symbol__alloc_hist(struct symbol *sym) { 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(u64) - sizeof(struct sym_hist))) + return -1; + + sizeof_sym_hist = (sizeof(struct sym_hist) + size * sizeof(u64)); + + /* Check for overflow in zalloc argument */ + if (sizeof_sym_hist > (SIZE_MAX / symbol_conf.nr_events + - sizeof(*notes->src))) + return -1; notes->src = zalloc(sizeof(*notes->src) + symbol_conf.nr_events * sizeof_sym_hist); if (notes->src == NULL) -- 1.7.9.5