Commit 84965ff8 authored by Jens Axboe's avatar Jens Axboe

io_uring: if we see flush on exit, cancel related tasks

Ensure we match tasks that belong to a dead or dying task as well, as we
need to reap those in addition to those belonging to the exiting task.

Cc: stable@vger.kernel.org # 5.9+
Reported-by: default avatarJosef Grieb <josef.grieb@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6ee1d745
...@@ -1069,8 +1069,12 @@ static bool io_match_task(struct io_kiocb *head, ...@@ -1069,8 +1069,12 @@ static bool io_match_task(struct io_kiocb *head,
{ {
struct io_kiocb *req; struct io_kiocb *req;
if (task && head->task != task) if (task && head->task != task) {
/* in terms of cancelation, always match if req task is dead */
if (head->task->flags & PF_EXITING)
return true;
return false; return false;
}
if (!files) if (!files)
return true; return true;
...@@ -9136,6 +9140,9 @@ static int io_uring_flush(struct file *file, void *data) ...@@ -9136,6 +9140,9 @@ static int io_uring_flush(struct file *file, void *data)
struct io_uring_task *tctx = current->io_uring; struct io_uring_task *tctx = current->io_uring;
struct io_ring_ctx *ctx = file->private_data; struct io_ring_ctx *ctx = file->private_data;
if (fatal_signal_pending(current) || (current->flags & PF_EXITING))
io_uring_cancel_task_requests(ctx, NULL);
if (!tctx) if (!tctx)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment