Skip to content

Commit bb18645

Browse files
committed
Merge tag 'io_uring-6.14-20250322' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe: "Just a single fix for the commit that went into your tree yesterday, which exposed an issue with not always clearing notifications. That could cause them to be used more than once" * tag 'io_uring-6.14-20250322' of git://git.kernel.dk/linux: io_uring/net: fix sendzc double notif flush
2 parents 88d324e + 67c007d commit bb18645

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

io_uring/net.c

+2
Original file line numberDiff line numberDiff line change
@@ -1440,6 +1440,7 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags)
14401440
*/
14411441
if (!(issue_flags & IO_URING_F_UNLOCKED)) {
14421442
io_notif_flush(zc->notif);
1443+
zc->notif = NULL;
14431444
io_req_msg_cleanup(req, 0);
14441445
}
14451446
io_req_set_res(req, ret, IORING_CQE_F_MORE);
@@ -1500,6 +1501,7 @@ int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags)
15001501
*/
15011502
if (!(issue_flags & IO_URING_F_UNLOCKED)) {
15021503
io_notif_flush(sr->notif);
1504+
sr->notif = NULL;
15031505
io_req_msg_cleanup(req, 0);
15041506
}
15051507
io_req_set_res(req, ret, IORING_CQE_F_MORE);

0 commit comments

Comments
 (0)