Commit e2b005d6 authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim

perf metrics: Avoid segv if default metricgroup isn't set

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: 1c0e4795 ("perf metrics: Sort the Default metricgroup")
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Reviewed-and-tested-by: default avatarIlkka 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.comSigned-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 57686a72
...@@ -225,7 +225,7 @@ static struct metric *metric__new(const struct pmu_metric *pm, ...@@ -225,7 +225,7 @@ static struct metric *metric__new(const struct pmu_metric *pm,
m->pmu = pm->pmu ?: "cpu"; m->pmu = pm->pmu ?: "cpu";
m->metric_name = pm->metric_name; 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; m->modifier = NULL;
if (modifier) { if (modifier) {
m->modifier = strdup(modifier); m->modifier = strdup(modifier);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment