Commit d19a3ee5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.13-20241228' of git://git.kernel.dk/linux 

Pull io_uring fix from Jens Axboe:
 "Just a single fix for a theoretical issue with SQPOLL setup"

* tag 'io_uring-6.13-20241228' of git://git.kernel.dk/linux:
  io_uring/sqpoll: fix sqpoll error handling races
parents e51da4a2 e33ac68e

io_uring/sqpoll.c

+6 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ void io_sqpoll_wait_sq(struct io_ring_ctx *ctx) 
__cold int io_sq_offload_create(struct io_ring_ctx *ctx,

				struct io_uring_params *p)

{

	struct task_struct *task_to_put = NULL;

	int ret;



	/* Retain compatibility with failing for an invalid attach attempt */
@@ -480,6 +481,7 @@ __cold int io_sq_offload_create(struct io_ring_ctx *ctx, 
		}



		sqd->thread = tsk;

		task_to_put = get_task_struct(tsk);

		ret = io_uring_alloc_task_context(tsk, ctx);

		wake_up_new_task(tsk);

		if (ret)
@@ -490,11 +492,15 @@ __cold int io_sq_offload_create(struct io_ring_ctx *ctx, 
		goto err;

	}



	if (task_to_put)

		put_task_struct(task_to_put);

	return 0;

err_sqpoll:

	complete(&ctx->sq_data->exited);

err:

	io_sq_thread_finish(ctx);

	if (task_to_put)

		put_task_struct(task_to_put);

	return ret;

}