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

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fix from Ingo Molnar:
 "This fix adds missing RCU read protection"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  events: Protect access via task_subsys_state_check()
parents d7d7271f c79aa0d9

kernel/events/core.c

+2 −0
Original line number Diff line number Diff line
@@ -4596,6 +4596,7 @@ void perf_event_comm(struct task_struct *task) 
	struct perf_event_context *ctx;

	int ctxn;



	rcu_read_lock();

	for_each_task_context_nr(ctxn) {

		ctx = task->perf_event_ctxp[ctxn];

		if (!ctx)
@@ -4603,6 +4604,7 @@ void perf_event_comm(struct task_struct *task) 


		perf_event_enable_on_exec(ctx);

	}

	rcu_read_unlock();



	if (!atomic_read(&nr_comm_events))

		return;