From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752499AbcDWNBl (ORCPT ); Sat, 23 Apr 2016 09:01:41 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39684 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752038AbcDWNBj (ORCPT ); Sat, 23 Apr 2016 09:01:39 -0400 Date: Sat, 23 Apr 2016 06:01:23 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, milian.wolff@kdab.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, wangnan0@huawei.com, jolsa@kernel.org, mingo@kernel.org, adrian.hunter@intel.com, acme@redhat.com, namhyung@kernel.org, dsahern@gmail.com Reply-To: hpa@zytor.com, milian.wolff@kdab.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, mingo@kernel.org, wangnan0@huawei.com, jolsa@kernel.org, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf script: Check sample->callchain before using it Git-Commit-ID: 922315210b8007a26374e30712813b714af71cac 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: 922315210b8007a26374e30712813b714af71cac Gitweb: http://git.kernel.org/tip/922315210b8007a26374e30712813b714af71cac Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 18 Apr 2016 11:31:46 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 18 Apr 2016 11:31:46 -0300 perf script: Check sample->callchain before using it Found by code inspection, while looking at thread__resolve_callchain() callsites, one had it, the other didn't. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-6r8i2afd3523thuuaxl39yhk@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 0e93282b..5099740 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -791,7 +791,7 @@ static void process_event(struct perf_script *script, if (PRINT_FIELD(IP)) { struct callchain_cursor *cursor = NULL, cursor_callchain; - if (symbol_conf.use_callchain && + if (symbol_conf.use_callchain && sample->callchain && thread__resolve_callchain(al->thread, &cursor_callchain, evsel, sample, NULL, NULL, scripting_max_stack) == 0) cursor = &cursor_callchain;