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

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
parents 88d324e6 67c007d6

io_uring/net.c

+2 −0
Original line number Diff line number Diff line
@@ -1440,6 +1440,7 @@ int io_send_zc(struct io_kiocb *req, unsigned int issue_flags) 
	 */

	if (!(issue_flags & IO_URING_F_UNLOCKED)) {

		io_notif_flush(zc->notif);

		zc->notif = NULL;

		io_req_msg_cleanup(req, 0);

	}

	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) 
	 */

	if (!(issue_flags & IO_URING_F_UNLOCKED)) {

		io_notif_flush(sr->notif);

		sr->notif = NULL;

		io_req_msg_cleanup(req, 0);

	}

	io_req_set_res(req, ret, IORING_CQE_F_MORE);