]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
perf metrics: Fix SEGV with --for-each-cgroup
authorIan Rogers <irogers@google.com>
Fri, 5 May 2023 20:41:19 +0000 (13:41 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 5 May 2023 22:18:55 +0000 (19:18 -0300)
Ensure the metric threshold is copied correctly or else a use of
uninitialized memory happens.

Fixes: d0a3052f6faefffc ("perf metric: Compute and print threshold values")
Reported-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Ian Rogers <irogers@google.com>
Tested-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230505204119.3443491-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/metricgroup.c

index 4b9a16291b96a6cf073ed8f8c3ed5a9b545898f8..c566c6859302697b10314677c182a6cfbb9fd90c 100644 (file)
@@ -1730,6 +1730,7 @@ int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *cgrp,
                                return -ENOMEM;
 
                        new_expr->metric_expr = old_expr->metric_expr;
+                       new_expr->metric_threshold = old_expr->metric_threshold;
                        new_expr->metric_name = strdup(old_expr->metric_name);
                        if (!new_expr->metric_name)
                                return -ENOMEM;