diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-22 10:45:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-22 10:45:44 -0700 |
| commit | bb18645ac1ee5b655f07a70e63ad27213a2596c8 (patch) | |
| tree | c147d68a6fe5ad801202e211cb85703d4877fea8 | |
| parent | Merge tag 'spi-fix-v6.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi (diff) | |
| parent | io_uring/net: fix sendzc double notif flush (diff) | |
| download | wireguard-linux-bb18645ac1ee5b655f07a70e63ad27213a2596c8.tar.xz wireguard-linux-bb18645ac1ee5b655f07a70e63ad27213a2596c8.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | io_uring/net.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index a288c75bb92c..50e8a3ccc9de 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -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); |