diff options
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/pmus.c | 3 | ||||
| -rw-r--r-- | tools/perf/util/tool_pmu.c | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 6498021acef0..7959af59908c 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -269,7 +269,8 @@ skip_pe_pmus: if ((to_read_types & PERF_TOOL_PMU_TYPE_TOOL_MASK) != 0 && (read_pmu_types & PERF_TOOL_PMU_TYPE_TOOL_MASK) == 0) { tool_pmu = tool_pmu__new(); - list_add_tail(&tool_pmu->list, &other_pmus); + if (tool_pmu) + list_add_tail(&tool_pmu->list, &other_pmus); } if ((to_read_types & PERF_TOOL_PMU_TYPE_HWMON_MASK) != 0 && (read_pmu_types & PERF_TOOL_PMU_TYPE_HWMON_MASK) == 0) diff --git a/tools/perf/util/tool_pmu.c b/tools/perf/util/tool_pmu.c index 9156745ea180..d43d6cf6e4a2 100644 --- a/tools/perf/util/tool_pmu.c +++ b/tools/perf/util/tool_pmu.c @@ -494,12 +494,20 @@ struct perf_pmu *tool_pmu__new(void) { struct perf_pmu *tool = zalloc(sizeof(struct perf_pmu)); + if (!tool) + goto out; tool->name = strdup("tool"); + if (!tool->name) { + zfree(&tool); + goto out; + } + tool->type = PERF_PMU_TYPE_TOOL; INIT_LIST_HEAD(&tool->aliases); INIT_LIST_HEAD(&tool->caps); INIT_LIST_HEAD(&tool->format); tool->events_table = find_core_events_table("common", "common"); +out: return tool; } |