]> git.itanic.dy.fi Git - linux-stable/commit
io_uring/net: save msghdr->msg_control for retries
authorJens Axboe <axboe@kernel.dk>
Mon, 12 Jun 2023 19:51:36 +0000 (13:51 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 14 Jun 2023 01:26:42 +0000 (19:26 -0600)
commitcac9e4418f4cbd548ccb065b3adcafe073f7f7d2
treeef49d2c9a2399b2b577b11261cfd3618a588e345
parentb6dad5178ceaf23f369c3711062ce1f2afc33644
io_uring/net: save msghdr->msg_control for retries

If the application sets ->msg_control and we have to later retry this
command, or if it got queued with IOSQE_ASYNC to begin with, then we
need to retain the original msg_control value. This is due to the net
stack overwriting this field with an in-kernel pointer, to copy it
in. Hitting that path for the second time will now fail the copy from
user, as it's attempting to copy from a non-user address.

Cc: stable@vger.kernel.org # 5.10+
Link: https://github.com/axboe/liburing/issues/880
Reported-and-tested-by: Marek Majkowski <marek@cloudflare.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/net.c