Commit f5e02656 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf_urgent_for_v5.17_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fix from Borislav Petkov:
 "Prevent cgroup event list corruption when switching events"

* tag 'perf_urgent_for_v5.17_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Fix list corruption in perf_cgroup_switch()
parents 808f0ab2 5f4e5ce6

kernel/events/core.c

+2 −2
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ static DEFINE_PER_CPU(struct list_head, cgrp_cpuctx_list); 
 */

static void perf_cgroup_switch(struct task_struct *task, int mode)

{

	struct perf_cpu_context *cpuctx;

	struct perf_cpu_context *cpuctx, *tmp;

	struct list_head *list;

	unsigned long flags;
@@ -850,7 +850,7 @@ static void perf_cgroup_switch(struct task_struct *task, int mode) 
	local_irq_save(flags);



	list = this_cpu_ptr(&cgrp_cpuctx_list);

	list_for_each_entry(cpuctx, list, cgrp_cpuctx_entry) {

	list_for_each_entry_safe(cpuctx, tmp, list, cgrp_cpuctx_entry) {

		WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0);



		perf_ctx_lock(cpuctx, cpuctx->task_ctx);