Commit 3da6bb41 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Peter Zijlstra
Browse files

perf/core: Fix WARN in perf_sigtrap() 

Since exit_task_work() runs after perf_event_exit_task_context() updated
ctx->task to TASK_TOMBSTONE, perf_sigtrap() from perf_pending_task() might
observe event->ctx->task == TASK_TOMBSTONE.

Swap the early exit tests in order not to hit WARN_ON_ONCE().

Closes: https://syzkaller.appspot.com/bug?extid=2fe61cb2a86066be6985


Reported-by: default avatarsyzbot <syzbot+2fe61cb2a86066be6985@syzkaller.appspotmail.com>
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/b1c224bd-97f9-462c-a3e3-125d5e19c983@I-love.SAKURA.ne.jp
parent d7b8f8e2

kernel/events/core.c

+7 −7
Original line number Diff line number Diff line
@@ -7204,18 +7204,18 @@ void perf_event_wakeup(struct perf_event *event) 
static void perf_sigtrap(struct perf_event *event)

{

	/*

	 * We'd expect this to only occur if the irq_work is delayed and either

	 * ctx->task or current has changed in the meantime. This can be the

	 * case on architectures that do not implement arch_irq_work_raise().

	 * Both perf_pending_task() and perf_pending_irq() can race with the

	 * task exiting.

	 */

	if (WARN_ON_ONCE(event->ctx->task != current))

	if (current->flags & PF_EXITING)

		return;



	/*

	 * Both perf_pending_task() and perf_pending_irq() can race with the

	 * task exiting.

	 * We'd expect this to only occur if the irq_work is delayed and either

	 * ctx->task or current has changed in the meantime. This can be the

	 * case on architectures that do not implement arch_irq_work_raise().

	 */

	if (current->flags & PF_EXITING)

	if (WARN_ON_ONCE(event->ctx->task != current))

		return;



	send_sig_perf((void __user *)event->pending_addr,