Skip to content

Commit 8bffa95

Browse files
Peter Zijlstragregkh
authored andcommitted
perf: Fix perf_pending_task() UaF
[ Upstream commit 517e6a3 ] Per syzbot it is possible for perf_pending_task() to run after the event is free()'d. There are two related but distinct cases: - the task_work was already queued before destroying the event; - destroying the event itself queues the task_work. The first cannot be solved using task_work_cancel() since perf_release() itself might be called from a task_work (____fput), which means the current->task_works list is already empty and task_work_cancel() won't be able to find the perf_pending_task() entry. The simplest alternative is extending the perf_event lifetime to cover the task_work. The second is just silly, queueing a task_work while you know the event is going away makes no sense and is easily avoided by re-arranging how the event is marked STATE_DEAD and ensuring it goes through STATE_OFF on the way down. Reported-by: syzbot+9228d6098455bb209ec8@syzkaller.appspotmail.com Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Marco Elver <elver@google.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 825bd2a commit 8bffa95

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

kernel/events/core.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2367,6 +2367,7 @@ event_sched_out(struct perf_event *event,
23672367
!event->pending_work) {
23682368
event->pending_work = 1;
23692369
dec = false;
2370+
WARN_ON_ONCE(!atomic_long_inc_not_zero(&event->refcount));
23702371
task_work_add(current, &event->pending_task, TWA_RESUME);
23712372
}
23722373
if (dec)
@@ -2412,6 +2413,7 @@ group_sched_out(struct perf_event *group_event,
24122413

24132414
#define DETACH_GROUP 0x01UL
24142415
#define DETACH_CHILD 0x02UL
2416+
#define DETACH_DEAD 0x04UL
24152417

24162418
/*
24172419
* Cross CPU call to remove a performance event
@@ -2432,12 +2434,20 @@ __perf_remove_from_context(struct perf_event *event,
24322434
update_cgrp_time_from_cpuctx(cpuctx, false);
24332435
}
24342436

2437+
/*
2438+
* Ensure event_sched_out() switches to OFF, at the very least
2439+
* this avoids raising perf_pending_task() at this time.
2440+
*/
2441+
if (flags & DETACH_DEAD)
2442+
event->pending_disable = 1;
24352443
event_sched_out(event, cpuctx, ctx);
24362444
if (flags & DETACH_GROUP)
24372445
perf_group_detach(event);
24382446
if (flags & DETACH_CHILD)
24392447
perf_child_detach(event);
24402448
list_del_event(event, ctx);
2449+
if (flags & DETACH_DEAD)
2450+
event->state = PERF_EVENT_STATE_DEAD;
24412451

24422452
if (!ctx->nr_events && ctx->is_active) {
24432453
if (ctx == &cpuctx->ctx)
@@ -5212,9 +5222,7 @@ int perf_event_release_kernel(struct perf_event *event)
52125222

52135223
ctx = perf_event_ctx_lock(event);
52145224
WARN_ON_ONCE(ctx->parent_ctx);
5215-
perf_remove_from_context(event, DETACH_GROUP);
52165225

5217-
raw_spin_lock_irq(&ctx->lock);
52185226
/*
52195227
* Mark this event as STATE_DEAD, there is no external reference to it
52205228
* anymore.
@@ -5226,8 +5234,7 @@ int perf_event_release_kernel(struct perf_event *event)
52265234
* Thus this guarantees that we will in fact observe and kill _ALL_
52275235
* child events.
52285236
*/
5229-
event->state = PERF_EVENT_STATE_DEAD;
5230-
raw_spin_unlock_irq(&ctx->lock);
5237+
perf_remove_from_context(event, DETACH_GROUP|DETACH_DEAD);
52315238

52325239
perf_event_ctx_unlock(event, ctx);
52335240

@@ -6662,6 +6669,8 @@ static void perf_pending_task(struct callback_head *head)
66626669
if (rctx >= 0)
66636670
perf_swevent_put_recursion_context(rctx);
66646671
preempt_enable_notrace();
6672+
6673+
put_event(event);
66656674
}
66666675

66676676
/*

0 commit comments

Comments
 (0)