Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'io_uring-6.6-2023-09-15' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe:
"Just a single fix, fixing a regression with poll first, recvmsg, and
using a provided buffer"
* tag 'io_uring-6.6-2023-09-15' of git://git.kernel.dk/linux:
io_uring/net: fix iter retargeting for selected buf
+5
+5
io_uring/net.c
+5
io_uring/net.c
···
183
183
memcpy(async_msg, kmsg, sizeof(*kmsg));
184
184
if (async_msg->msg.msg_name)
185
185
async_msg->msg.msg_name = &async_msg->addr;
186
+
187
+
if ((req->flags & REQ_F_BUFFER_SELECT) && !async_msg->msg.msg_iter.nr_segs)
188
+
return -EAGAIN;
189
+
186
190
/* if were using fast_iov, set it to the new one */
187
191
if (iter_is_iovec(&kmsg->msg.msg_iter) && !kmsg->free_iov) {
188
192
size_t fast_idx = iter_iov(&kmsg->msg.msg_iter) - kmsg->fast_iov;
···
546
542
struct io_async_msghdr *iomsg)
547
543
{
548
544
iomsg->msg.msg_name = &iomsg->addr;
545
+
iomsg->msg.msg_iter.nr_segs = 0;
549
546
550
547
#ifdef CONFIG_COMPAT
551
548
if (req->ctx->compat)