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 C967EC4167B for ; Mon, 11 Dec 2023 13:00:48 +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:Message-ID:Date:From:Cc:To :Subject:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=mPCIZ3WxbK7AiRnftUQL2Crot2rarkmzx917yX4Gi/I=; b=rW8FkVPkZpcnm9 DD+ktJV5JvFHbVVI/Zz0UiS4B/K61rH+tsHsHz90VUYWXSkyr93cch2OzOoCdlsWt90r36o0GjpzI aodb1ie6rkt2H2RuZ+WuFj0y07G0+7Ck09kuWlqGo21e3r1akjgngPmvzCueEnqHoptEKWvRG+iNz E8qxRwsCL3PnZgxtnj1crC/cNLTjJde+XtYsDiHfBY1/pqU0oVHMzsC7SHKEdzkYt7ChoIhjbnOOw mDqLSciIPEffbJw2PjpnMa7eAPNyh7o2T6EsAoPxeft1RvK6/TQNIjX/iCcKC5ozf8rhX3wf/pNAN aL674PBmZWBCvxDd3l0Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rCftW-004uKr-0h; Mon, 11 Dec 2023 13:00:22 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rCftO-004uIE-0n for linux-arm-kernel@lists.infradead.org; Mon, 11 Dec 2023 13:00:20 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id DC2DDB80E3A; Mon, 11 Dec 2023 13:00:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E246BC433CA; Mon, 11 Dec 2023 13:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1702299612; bh=etqRhdVliojUZohLCag4QEtSr4sk7V6cnmchU/zfWXA=; h=Subject:To:Cc:From:Date:From; b=zYSYnsJ+vSIHO72wHbUlwAePYykzhymx0fOJN0k71qp4Qyhzhvl03hzfzANvQxLWU 41P9lIoRfWSV7U3tmAI1ahCrxxdH+o/79czXFiUJGFqi322ujSKOhJa0quRe4SWHtR vNpmmVZmlQDamGHns4s/SOoeOiC9Et9RP1W2WMvg= Subject: Patch "perf metrics: Avoid segv if default metricgroup isn't set" has been added to the 6.6-stable tree To: gregkh@linuxfoundation.org,ilkka@os.amperecomputing.com,irogers@google.com,james.clark@arm.com,john.g.garry@oracle.com,kan.liang@linux.intel.com,kjain@linux.ibm.com,leo.yan@linaro.org,linux-arm-kernel@lists.infradead.org,mike.leach@linaro.org,namhyung@kernel.org,will@kernel.org Cc: From: Date: Mon, 11 Dec 2023 13:57:44 +0100 Message-ID: <2023121144-gravitate-escalate-00b5@gregkh> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231211_050015_203787_9E8E0711 X-CRM114-Status: GOOD ( 16.66 ) 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 This is a note to let you know that I've just added the patch titled perf metrics: Avoid segv if default metricgroup isn't set to the 6.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: perf-metrics-avoid-segv-if-default-metricgroup-isn-t-set.patch and it can be found in the queue-6.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From e2b005d6ec0e738df584190e21d2c7ada37266a0 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Mon, 4 Dec 2023 10:23:29 -0800 Subject: perf metrics: Avoid segv if default metricgroup isn't set 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 Patches currently in stable-queue which might be from irogers@google.com are queue-6.6/perf-vendor-events-arm64-ampereone-add-missing-defau.patch queue-6.6/perf-metrics-avoid-segv-if-default-metricgroup-isn-t-set.patch queue-6.6/perf-list-fix-json-segfault-by-setting-the-used-skip_duplicate_pmus-callback.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel