perf metrics: Avoid segv if default metricgroup isn't set
authorIan Rogers <irogers@google.com>
Mon, 4 Dec 2023 18:23:29 +0000 (10:23 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Dec 2023 17:45:34 +0000 (18:45 +0100)
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 <irogers@google.com>
Reviewed-and-tested-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Cc: James Clark <james.clark@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: John Garry <john.g.garry@oracle.com>
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 <namhyung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/perf/util/metricgroup.c

index 6231044..bb5faaa 100644 (file)
@@ -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);