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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A27C6C4167B for ; Mon, 11 Dec 2023 18:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Eh4lVUaQILHDT4MJlS+YqBJWHRb9l9k2MHzDdHrcAGc=; b=eEtyw5MQF5Euoc DQ47pB+Q+i6NEGJxh1UZgt9E0LEbk/2o/x8w2t7YYEGxYv/fxCc3YGuYWo8bS3V77LA6VkkgPlPDh iw6gEPOZ0MDqQyKZKb7VUyLAbot7aiZg8uKsNOoGUIYhDsJQlyDJWC8ELzgft4vBh+1rM/YNxbF8L QmP98e/D4MeGvcFAH5apKKNlpy8Oyu0NvNmKASXoHzA63LDLIoo8YXgdNUcPjNHKuIqsbXhStfaQl uuXHLz5f6Csu7KbtlDoLPIae0Hr3PUFOtzDgagN5ScAOGsEbVv9ToHCqUmuI2SlBIk7fcp8NOE7Bn ceKX8FAGGToGFpbfZIZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rCl8x-00708X-13; Mon, 11 Dec 2023 18:36:39 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rCl8u-00704h-0d for linux-arm-kernel@lists.infradead.org; Mon, 11 Dec 2023 18:36:37 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 2AA74CE13DD; Mon, 11 Dec 2023 18:36:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2457C433C8; Mon, 11 Dec 2023 18:36:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1702319793; bh=3Q1qSJG6tZO+o5B7q46I66UC6RXGudBbUOy4o4pQWFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hCcFHG+fydbaUKBtf1/mYnizwyf0hgC2actoM5U/OCbla5sLkus67+H4t62tWzA9i 9Gpxe8TwNzQl++Ep+vUwva8nmS+1jQpIq4CfNDZ6S1wUTdIEVcEH5iKjPQctvrM8o/ wSBg0WDer7/VhwUoyZ4l6QU82sCp8wyMy4HPg8fk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , James Clark , Will Deacon , Leo Yan , Mike Leach , Kajol Jain , Kan Liang , John Garry , linux-arm-kernel@lists.infradead.org, Namhyung Kim , Ilkka Koskinen Subject: [PATCH 6.6 234/244] perf metrics: Avoid segv if default metricgroup isnt set Date: Mon, 11 Dec 2023 19:22:07 +0100 Message-ID: <20231211182056.532304701@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231211182045.784881756@linuxfoundation.org> References: <20231211182045.784881756@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231211_103636_461363_E5E67A86 X-CRM114-Status: GOOD ( 13.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers commit e2b005d6ec0e738df584190e21d2c7ada37266a0 upstream. A metric is default by having "Default" within its groups. The default metricgroup name needn't be set and this can result in segv in default_metricgroup_cmp and perf_stat__print_shadow_stats_metricgroup that assume it has a value when there is a Default metric group. To avoid the segv initialize the value to "". Fixes: 1c0e47956a8e ("perf metrics: Sort the Default metricgroup") Signed-off-by: Ian Rogers Reviewed-and-tested-by: Ilkka Koskinen Cc: James Clark Cc: Will Deacon Cc: Leo Yan Cc: Mike Leach Cc: Kajol Jain Cc: Kan Liang Cc: John Garry Cc: stable@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Link: https://lore.kernel.org/r/20231204182330.654255-1-irogers@google.com Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/metricgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 0484736d9fe4..ca3e0404f187 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -225,7 +225,7 @@ static struct metric *metric__new(const struct pmu_metric *pm, m->pmu = pm->pmu ?: "cpu"; m->metric_name = pm->metric_name; - m->default_metricgroup_name = pm->default_metricgroup_name; + m->default_metricgroup_name = pm->default_metricgroup_name ?: ""; m->modifier = NULL; if (modifier) { m->modifier = strdup(modifier); -- 2.43.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel