Skip to content

Commit d07de43

Browse files
committed
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
2 parents 5c7474b + cc34d83 commit d07de43

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

io_uring/net.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static void io_netmsg_recycle(struct io_kiocb *req, unsigned int issue_flags)
148148
io_alloc_cache_kasan(&hdr->free_iov, &hdr->free_iov_nr);
149149
if (io_alloc_cache_put(&req->ctx->netmsg_cache, hdr)) {
150150
req->async_data = NULL;
151-
req->flags &= ~REQ_F_ASYNC_DATA;
151+
req->flags &= ~(REQ_F_ASYNC_DATA|REQ_F_NEED_CLEANUP);
152152
}
153153
}
154154

@@ -441,7 +441,6 @@ int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
441441
static void io_req_msg_cleanup(struct io_kiocb *req,
442442
unsigned int issue_flags)
443443
{
444-
req->flags &= ~REQ_F_NEED_CLEANUP;
445444
io_netmsg_recycle(req, issue_flags);
446445
}
447446

0 commit comments

Comments
 (0)