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

Merge tag 'io_uring-6.14-20250321' of git://git.kernel.dk/linux 

Pull io_uring fix from Jens Axboe:
 "Single fix heading to stable, fixing an issue with io_req_msg_cleanup()
  sometimes too eagerly clearing cleanup flags"

* tag 'io_uring-6.14-20250321' of git://git.kernel.dk/linux:
  io_uring/net: don't clear REQ_F_NEED_CLEANUP unconditionally
parents 5c7474b5 cc34d833

io_uring/net.c

+1 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags) 
	io_alloc_cache_kasan(&hdr->free_iov, &hdr->free_iov_nr);

	if (io_alloc_cache_put(&req->ctx->netmsg_cache, hdr)) {

		req->async_data = NULL;

		req->flags &= ~REQ_F_ASYNC_DATA;

		req->flags &= ~(REQ_F_ASYNC_DATA|REQ_F_NEED_CLEANUP);

	}

}
@@ -441,7 +441,6 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) 
static void io_req_msg_cleanup(struct io_kiocb *req,

			       unsigned int issue_flags)

{

	req->flags &= ~REQ_F_NEED_CLEANUP;

	io_netmsg_recycle(req, issue_flags);

}