github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 10:04:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

perf hwmon_pmu: Ensure hwmon key union is zeroed before use

Browse Source 
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>
This commit is contained in:
Ian Rogers 2024-11-19 15:00:33 -08:00 committed by Namhyung Kim
parent 870748fa1f
commit 62878b400f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/perf/util/hwmon_pmu.c
View File

@ -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;