Skip to content

Commit 617a894

Browse files
isilenceaxboe
authored andcommitted
io_uring: fail cancellation for EXITING tasks
WARNING: CPU: 1 PID: 20 at fs/io_uring.c:6269 io_try_cancel_userdata+0x3c5/0x640 fs/io_uring.c:6269 CPU: 1 PID: 20 Comm: kworker/1:0 Not tainted 5.16.0-rc1-syzkaller #0 Workqueue: events io_fallback_req_func RIP: 0010:io_try_cancel_userdata+0x3c5/0x640 fs/io_uring.c:6269 Call Trace: <TASK> io_req_task_link_timeout+0x6b/0x1e0 fs/io_uring.c:6886 io_fallback_req_func+0xf9/0x1ae fs/io_uring.c:1334 process_one_work+0x9b2/0x1690 kernel/workqueue.c:2298 worker_thread+0x658/0x11f0 kernel/workqueue.c:2445 kthread+0x405/0x4f0 kernel/kthread.c:327 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295 </TASK> We need original task's context to do cancellations, so if it's dying and the callback is executed in a fallback mode, fail the cancellation attempt. Fixes: 89b263f ("io_uring: run linked timeouts from task_work") Cc: [email protected] # 5.15+ Reported-by: [email protected] Signed-off-by: Pavel Begunkov <[email protected]> Link: https://lore.kernel.org/r/4c41c5f379c6941ad5a07cd48cb66ed62199cf7e.1637937097.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <[email protected]>
1 parent 674ee8e commit 617a894

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/io_uring.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6882,10 +6882,11 @@ static inline struct file *io_file_get(struct io_ring_ctx *ctx,
68826882
static void io_req_task_link_timeout(struct io_kiocb *req, bool *locked)
68836883
{
68846884
struct io_kiocb *prev = req->timeout.prev;
6885-
int ret;
6885+
int ret = -ENOENT;
68866886

68876887
if (prev) {
6888-
ret = io_try_cancel_userdata(req, prev->user_data);
6888+
if (!(req->task->flags & PF_EXITING))
6889+
ret = io_try_cancel_userdata(req, prev->user_data);
68896890
io_req_complete_post(req, ret ?: -ETIME, 0);
68906891
io_put_req(prev);
68916892
} else {

0 commit comments

Comments
 (0)