Skip to content

Commit 2fd5ad3

Browse files
Frederic WeisbeckerPeter Zijlstra
authored andcommitted
perf: Fix event leak upon exit
When a task is scheduled out, pending sigtrap deliveries are deferred to the target task upon resume to userspace via task_work. However failures while adding an event's callback to the task_work engine are ignored. And since the last call for events exit happen after task work is eventually closed, there is a small window during which pending sigtrap can be queued though ignored, leaking the event refcount addition such as in the following scenario: TASK A ----- do_exit() exit_task_work(tsk); <IRQ> perf_event_overflow() event->pending_sigtrap = pending_id; irq_work_queue(&event->pending_irq); </IRQ> =========> PREEMPTION: TASK A -> TASK B event_sched_out() event->pending_sigtrap = 0; atomic_long_inc_not_zero(&event->refcount) // FAILS: task work has exited task_work_add(&event->pending_task) [...] <IRQ WORK> perf_pending_irq() // early return: event->oncpu = -1 </IRQ WORK> [...] =========> TASK B -> TASK A perf_event_exit_task(tsk) perf_event_exit_event() free_event() WARN(atomic_long_cmpxchg(&event->refcount, 1, 0) != 1) // leak event due to unexpected refcount == 2 As a result the event is never released while the task exits. Fix this with appropriate task_work_add()'s error handling. Fixes: 517e6a3 ("perf: Fix perf_pending_task() UaF") Signed-off-by: Frederic Weisbecker <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/r/[email protected]
1 parent f409530 commit 2fd5ad3

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

kernel/events/core.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2284,18 +2284,15 @@ event_sched_out(struct perf_event *event, struct perf_event_context *ctx)
22842284
}
22852285

22862286
if (event->pending_sigtrap) {
2287-
bool dec = true;
2288-
22892287
event->pending_sigtrap = 0;
22902288
if (state != PERF_EVENT_STATE_OFF &&
2291-
!event->pending_work) {
2292-
event->pending_work = 1;
2293-
dec = false;
2289+
!event->pending_work &&
2290+
!task_work_add(current, &event->pending_task, TWA_RESUME)) {
22942291
WARN_ON_ONCE(!atomic_long_inc_not_zero(&event->refcount));
2295-
task_work_add(current, &event->pending_task, TWA_RESUME);
2296-
}
2297-
if (dec)
2292+
event->pending_work = 1;
2293+
} else {
22982294
local_dec(&event->ctx->nr_pending);
2295+
}
22992296
}
23002297

23012298
perf_event_set_state(event, state);

0 commit comments

Comments
 (0)