summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/hwmon_pmu.c
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2024-11-19 15:00:33 -0800
committerNamhyung Kim <namhyung@kernel.org>2024-11-22 13:38:39 -0800
commit62878b400f5b02416368eda361277c045c675466 (patch)
treeb22648fd463030776e8d283bc1d8ab842dbea357 /tools/perf/util/hwmon_pmu.c
parent870748fa1fac5a397c26126bc32662e9249762c7 (diff)
downloadlinux-stable-62878b400f5b02416368eda361277c045c675466.tar.gz
linux-stable-62878b400f5b02416368eda361277c045c675466.tar.bz2
linux-stable-62878b400f5b02416368eda361277c045c675466.zip
perf hwmon_pmu: Ensure hwmon key union is zeroed before use
Non-zero values led to mismatches in testing. This was reproducible with -fsanitize=undefined. Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org> Closes: https://lore.kernel.org/lkml/Zzdtj0PEWEX3ATwL@x1/ Signed-off-by: Ian Rogers <irogers@google.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/r/20241119230033.115369-1-irogers@google.com Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/perf/util/hwmon_pmu.c')
-rw-r--r--tools/perf/util/hwmon_pmu.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/perf/util/hwmon_pmu.c b/tools/perf/util/hwmon_pmu.c
index ac2245acdc6d..4d9d6f405434 100644
--- a/tools/perf/util/hwmon_pmu.c
+++ b/tools/perf/util/hwmon_pmu.c
@@ -274,7 +274,7 @@ static int hwmon_pmu__read_events(struct hwmon_pmu *pmu)
int number;
enum hwmon_item item;
bool alarm;
- union hwmon_pmu_event_key key = {};
+ union hwmon_pmu_event_key key = { .type_and_num = 0 };
struct hwmon_pmu_event_value *value;
if (ent->d_type != DT_REG)
@@ -560,7 +560,7 @@ bool hwmon_pmu__have_event(struct perf_pmu *pmu, const char *name)
struct hwmon_pmu *hwm = container_of(pmu, struct hwmon_pmu, pmu);
enum hwmon_type type;
int number;
- union hwmon_pmu_event_key key = {};
+ union hwmon_pmu_event_key key = { .type_and_num = 0 };
struct hashmap_entry *cur;
size_t bkt;
@@ -623,10 +623,11 @@ static int hwmon_pmu__config_term(const struct hwmon_pmu *hwm,
return -EINVAL;
} else {
union hwmon_pmu_event_key key = {
- .type = type,
- .num = number,
+ .type_and_num = 0,
};
+ key.type = type;
+ key.num = number;
attr->config = key.type_and_num;
}
return 0;