From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD95BC43613 for ; Fri, 21 Jun 2019 17:41:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8800721530 for ; Fri, 21 Jun 2019 17:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561138877; bh=ktL2obbEaG7ObyftYwP7WvZszIWpwmPJYyAMLIEv7gM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2eWj0zNQCU6+D7COorFbHgUg4yMMUiK7PzV8dI0ukYr/vLo3BzWHyZJI4bHemeqVM bJuciAgCCymLTAZ8JnaRJSTlxdurIaMUiHOVfi3nFpYhq3vqFim4gLFLNuLztYrCbr 2fq/R/HzSO3JPdYS5xxp0/sUsv2xghu+JmCwH884= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726654AbfFURlQ (ORCPT ); Fri, 21 Jun 2019 13:41:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:60342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726645AbfFURlO (ORCPT ); Fri, 21 Jun 2019 13:41:14 -0400 Received: from quaco.ghostprotocols.net (187-26-104-93.3g.claro.net.br [187.26.104.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D8D49208CA; Fri, 21 Jun 2019 17:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561138873; bh=ktL2obbEaG7ObyftYwP7WvZszIWpwmPJYyAMLIEv7gM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TORwxQoYVVFsCchBQ8MVMZIBklqQwqSF7EfSWYgtmKj9sdB7jTpR+w1fo47qHGAkJ sFmcx4Fjon0kusBP2geO3cTNRFYt7mt8g++h8PRl2E4q6DRE80F6scPu7J6tEtF+C2 HLJh50RajgyR4Jl6WXRoo1U/PxzO+Vxvoe2OojnU= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Leo Yan , Adrian Hunter Subject: [PATCH 21/25] perf evsel: Make perf_evsel__name() accept a NULL argument Date: Fri, 21 Jun 2019 14:38:27 -0300 Message-Id: <20190621173831.13780-22-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190621173831.13780-1-acme@kernel.org> References: <20190621173831.13780-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo In which case it simply returns "unknown", like when it can't figure out the evsel->name value. This makes this code more robust and fixes a problem in 'perf trace' where a NULL evsel was being passed to a routine that only used the evsel for printing its name when a invalid syscall id was passed. Reported-by: Leo Yan Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lkml.kernel.org/n/tip-f30ztaasku3z935cn3ak3h53@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 0f506f10ecf0..04c4ed1573cb 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -589,6 +589,9 @@ const char *perf_evsel__name(struct perf_evsel *evsel) { char bf[128]; + if (!evsel) + goto out_unknown; + if (evsel->name) return evsel->name; @@ -628,7 +631,10 @@ const char *perf_evsel__name(struct perf_evsel *evsel) evsel->name = strdup(bf); - return evsel->name ?: "unknown"; + if (evsel->name) + return evsel->name; +out_unknown: + return "unknown"; } const char *perf_evsel__group_name(struct perf_evsel *evsel) -- 2.20.1