From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755746AbdEKNNd (ORCPT ); Thu, 11 May 2017 09:13:33 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:41404 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754925AbdEKNNb (ORCPT ); Thu, 11 May 2017 09:13:31 -0400 Reply-To: pc@us.ibm.com Subject: Re: [PATCH] perf report: don't crash on invalid maps in `-g srcline` mode References: <20170509205046.21473-1-milian.wolff@kdab.com> To: Milian Wolff , Linux-kernel@vger.kernel.org Cc: linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , David Ahern , Namhyung Kim , Peter Zijlstra , Yao Jin From: Paul Clarke Date: Thu, 11 May 2017 08:13:24 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170509205046.21473-1-milian.wolff@kdab.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 17051113-0048-0000-0000-0000017EB550 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007046; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000210; SDB=6.00859141; UDB=6.00425774; IPR=6.00638616; BA=6.00005345; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00015411; XFM=3.00000015; UTC=2017-05-11 13:13:28 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17051113-0049-0000-0000-00004116D4EE Message-Id: <0d08c9db-1715-c8b8-950d-9034760499b4@us.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-11_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705110074 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/09/2017 03:50 PM, Milian Wolff wrote: > diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c > index 9ab68682c6d0..295f0846fd84 100644 > --- a/tools/perf/util/callchain.c > +++ b/tools/perf/util/callchain.c > @@ -642,13 +642,22 @@ static enum match_result match_chain_strings(const char *left, > static enum match_result match_chain_srcline(struct callchain_cursor_node *node, > struct callchain_list *cnode) > { > - char *left = get_srcline(cnode->ms.map->dso, > - map__rip_2objdump(cnode->ms.map, cnode->ip), > - cnode->ms.sym, true, false); > - char *right = get_srcline(node->map->dso, > - map__rip_2objdump(node->map, node->ip), > - node->sym, true, false); > - enum match_result ret = match_chain_strings(left, right); > + char *left = NULL; > + char *right = NULL; nit: the above two initializations are unnecessary. > + enum match_result ret = MATCH_ERROR; > + > + if (!node->map || !cnode->ms.map) > + return ret; > + > + left = get_srcline(cnode->ms.map->dso, > + map__rip_2objdump(cnode->ms.map, cnode->ip), > + cnode->ms.sym, true, false); > + > + right = get_srcline(node->map->dso, > + map__rip_2objdump(node->map, node->ip), > + node->sym, true, false); > + > + ret = match_chain_strings(left, right); > > free_srcline(left); > free_srcline(right); PC