projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
978e5c1
)
io_uring/net: restore msg_control on sendzc retry
author
Pavel Begunkov
<asml.silence@gmail.com>
Mon, 8 Apr 2024 17:11:09 +0000
(18:11 +0100)
committer
Jens Axboe
<axboe@kernel.dk>
Tue, 9 Apr 2024 03:48:41 +0000
(21:48 -0600)
cac9e4418f4cb
("io_uring/net: save msghdr->msg_control for retries")
reinstatiates msg_control before every __sys_sendmsg_sock(), since the
function can overwrite the value in msghdr. We need to do same for
zerocopy sendmsg.
Cc: stable@vger.kernel.org
Fixes:
493108d95f146
("io_uring/net: zerocopy sendmsg")
Link:
https://github.com/axboe/liburing/issues/1067
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link:
https://lore.kernel.org/r/cc1d5d9df0576fa66ddad4420d240a98a020b267.1712596179.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/net.c
patch
|
blob
|
blame
|
history
diff --git
a/io_uring/net.c
b/io_uring/net.c
index 1e7665ff6ef70264b26206f99c34aa5516190129..4afb475d41974b95a86a22bd84771d8c29781c08 100644
(file)
--- a/
io_uring/net.c
+++ b/
io_uring/net.c
@@
-1276,6
+1276,7
@@
int io_sendmsg_zc(struct io_kiocb *req, unsigned int issue_flags)
if (req_has_async_data(req)) {
kmsg = req->async_data;
+ kmsg->msg.msg_control_user = sr->msg_control;
} else {
ret = io_sendmsg_copy_hdr(req, &iomsg);
if (ret)