Commit 7bba6c86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1391af03 dbde07f0

arch/x86/events/intel/core.c

+4 −2
Original line number Diff line number Diff line
@@ -4855,9 +4855,11 @@ static int intel_pmu_hw_config(struct perf_event *event) 
		intel_pmu_set_acr_caused_constr(leader, idx++, cause_mask);



		if (leader->nr_siblings) {

			for_each_sibling_event(sibling, leader)

			for_each_sibling_event(sibling, leader) {

				if (is_x86_event(sibling))

					intel_pmu_set_acr_caused_constr(sibling, idx++, cause_mask);

			}

		}



		if (leader != event)

			intel_pmu_set_acr_caused_constr(event, idx, cause_mask);