From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751759AbdJ1XO2 (ORCPT ); Sat, 28 Oct 2017 19:14:28 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57009 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751460AbdJ1XOZ (ORCPT ); Sat, 28 Oct 2017 19:14:25 -0400 Date: Sat, 28 Oct 2017 16:09:55 -0700 From: tip-bot for Ravi Bangoria Message-ID: Cc: alexander.shishkin@linux.intel.com, peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, yao.jin@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, ravi.bangoria@linux.vnet.ibm.com, acme@redhat.com, naveen.n.rao@linux.vnet.ibm.com, kim.phillips@arm.com, jolsa@kernel.org, treeze.taeung@gmail.com Reply-To: hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org, yao.jin@linux.intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, alexander.shishkin@linux.intel.com, treeze.taeung@gmail.com, jolsa@kernel.org, kim.phillips@arm.com, acme@redhat.com, naveen.n.rao@linux.vnet.ibm.com, ravi.bangoria@linux.vnet.ibm.com In-Reply-To: <1508854806-10542-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com> References: <1508854806-10542-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf symbols: Fix memory corruption because of zero length symbols Git-Commit-ID: 331c7cb307971eac38e9470340e10c87855bf4bc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 331c7cb307971eac38e9470340e10c87855bf4bc Gitweb: https://git.kernel.org/tip/331c7cb307971eac38e9470340e10c87855bf4bc Author: Ravi Bangoria AuthorDate: Tue, 24 Oct 2017 19:50:06 +0530 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 25 Oct 2017 13:01:09 -0300 perf symbols: Fix memory corruption because of zero length symbols Perf top is often crashing at very random locations on powerpc. After investigating, I found the crash only happens when sample is of zero length symbol. Powerpc kernel has many such symbols which does not contain length details in vmlinux binary and thus start and end addresses of such symbols are same. Structure struct sym_hist { u64 nr_samples; u64 period; struct sym_hist_entry addr[0]; }; has last member 'addr[]' of size zero. 'addr[]' is an array of addresses that belongs to one symbol (function). If function consist of 100 instructions, 'addr' points to an array of 100 'struct sym_hist_entry' elements. For zero length symbol, it points to the *empty* array, i.e. no members in the array and thus offset 0 is also invalid for such array. static int __symbol__inc_addr_samples(...) { ... offset = addr - sym->start; h = annotation__histogram(notes, evidx); h->nr_samples++; h->addr[offset].nr_samples++; h->period += sample->period; h->addr[offset].period += sample->period; ... } Here, when 'addr' is same as 'sym->start', 'offset' becomes 0, which is valid for normal symbols but *invalid* for zero length symbols and thus updating h->addr[offset] causes memory corruption. Fix this by adding one dummy element for zero length symbols. Link: https://lkml.org/lkml/2016/10/10/148 Fixes: edee44be5919 ("perf annotate: Don't throw error for zero length symbols") Signed-off-by: Ravi Bangoria Acked-by: Jiri Olsa Acked-by: Namhyung Kim Cc: Alexander Shishkin Cc: Jin Yao Cc: Kim Phillips Cc: Naveen N. Rao Cc: Peter Zijlstra Cc: Taeung Song Link: http://lkml.kernel.org/r/1508854806-10542-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 4397a8b..aa66791 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -606,9 +606,19 @@ static struct arch *arch__find(const char *name) int symbol__alloc_hist(struct symbol *sym) { struct annotation *notes = symbol__annotation(sym); - const size_t size = symbol__size(sym); + size_t size = symbol__size(sym); size_t sizeof_sym_hist; + /* + * Add buffer of one element for zero length symbol. + * When sample is taken from first instruction of + * zero length symbol, perf still resolves it and + * shows symbol name in perf report and allows to + * annotate it. + */ + if (size == 0) + size = 1; + /* Check for overflow when calculating sizeof_sym_hist */ if (size > (SIZE_MAX - sizeof(struct sym_hist)) / sizeof(struct sym_hist_entry)) return -1;