Skip to content

Commit 7bba6c8

Browse files
committed
Merge tag 'perf-urgent-2026-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Ingo Molnar: - Fix potential bad container_of() in intel_pmu_hw_config() (Ian Rogers) * tag 'perf-urgent-2026-04-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86: Fix potential bad container_of in intel_pmu_hw_config
2 parents 1391af0 + dbde07f commit 7bba6c8

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

arch/x86/events/intel/core.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4855,8 +4855,10 @@ static int intel_pmu_hw_config(struct perf_event *event)
48554855
intel_pmu_set_acr_caused_constr(leader, idx++, cause_mask);
48564856

48574857
if (leader->nr_siblings) {
4858-
for_each_sibling_event(sibling, leader)
4859-
intel_pmu_set_acr_caused_constr(sibling, idx++, cause_mask);
4858+
for_each_sibling_event(sibling, leader) {
4859+
if (is_x86_event(sibling))
4860+
intel_pmu_set_acr_caused_constr(sibling, idx++, cause_mask);
4861+
}
48604862
}
48614863

48624864
if (leader != event)

0 commit comments

Comments
 (0)