summaryrefslogtreecommitdiffstats
path: root/io_uring/io-wq.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2023-01-08 10:39:17 -0700
committerJens Axboe <axboe@kernel.dk>2023-01-08 10:39:17 -0700
commite6db6f9398dadcbc06318a133d4c44a2d3844e61 (patch)
treebc380bbae611939e1bbf90b54265b807bd76ab84 /io_uring/io-wq.c
parent12521a5d5cb7ff0ad43eadfc9c135d86e1131fa8 (diff)
downloadlinux-e6db6f9398dadcbc06318a133d4c44a2d3844e61.tar.gz
linux-e6db6f9398dadcbc06318a133d4c44a2d3844e61.tar.bz2
linux-e6db6f9398dadcbc06318a133d4c44a2d3844e61.zip
io_uring/io-wq: only free worker if it was allocated for creation
We have two types of task_work based creation, one is using an existing worker to setup a new one (eg when going to sleep and we have no free workers), and the other is allocating a new worker. Only the latter should be freed when we cancel task_work creation for a new worker. Fixes: af82425c6a2d ("io_uring/io-wq: free worker if task_work creation is canceled") Reported-by: syzbot+d56ec896af3637bdb7e4@syzkaller.appspotmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/io-wq.c')
-rw-r--r--io_uring/io-wq.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/io_uring/io-wq.c b/io_uring/io-wq.c
index 992dcd9f8c4c..411bb2d1acd4 100644
--- a/io_uring/io-wq.c
+++ b/io_uring/io-wq.c
@@ -1230,7 +1230,12 @@ static void io_wq_cancel_tw_create(struct io_wq *wq)
worker = container_of(cb, struct io_worker, create_work);
io_worker_cancel_cb(worker);
- kfree(worker);
+ /*
+ * Only the worker continuation helper has worker allocated and
+ * hence needs freeing.
+ */
+ if (cb->func == create_worker_cont)
+ kfree(worker);
}
}