mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

io_uring-6.6-2023-09-15 

-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmUEd5gQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgputVD/9C5kCnvQ6zTsbzgaFlbgqsKEMlxp46tmin
 vYUAm2Ix3KyaGkveO2GIfMGuVt6oIBdkiarYT9n89gOAak0s8VoMVRi8eQivFdpw
 M4UTWojX7lJAl9aU3DaBnIAg9rWWYesGYgArz5eLCDfNBfDKLbH3/ytpVJ8CvDF8
 Bgp9Q8tm4cf1yZJ7ILp+cp8fTerm6K/TGWwhDdPomjC7nD/TJFMKmPnI9tCjz0sf
 kfwL7ygGuEQ5xhDHvxp3L720GO6flGo4G/xKC8EBUYp5YJGZfqvuIVFc6YBwNxdZ
 y5cC3i8hocNsPGJxyWdZf8dt6dX8SyaVZneUpm2lRN8NF+yKQQ6p2BX4bQtnjhvM
 IInmj4z0gDXPlkldG3Nh6EVmlSp2wNudhoelqRGBMHvkDUxO3W/Ms2xHp+Pjjxvh
 zgvJ9lBtgVbj/xZyLNBxmjQMoimeXaF31KM/r3Jc27+IMCpEiq9OlTlNhjzmILOn
 57djFTBbT6YILcVDuRe3N/ecZ5XR50VlR43uswBYNpTJhf7rjHGTnP0gBvw01Dkx
 XKDXNt3hxFE3PNgQeAAOJJvK9F5ilFb9aWZwrMQLai1GRP6GCyBucPB8SKYaKyne
 ZL4RDqcSOgGkwCmIAmtNyX6N0aj3eSZ1uIa39GmMhx5UxcbU+sj4nJfUcNyGzqPP
 HlKjT8SAkg==
 =0Mv3
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-09-15 13:55:29 -07:00
parent 0e494be7c5 c21a8027ad
commit 31d8fddb58
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
io_uring/net.c
View File

@ -183,6 +183,10 @@ static int io_setup_async_msg(struct io_kiocb *req,
memcpy(async_msg, kmsg, sizeof(*kmsg));
if (async_msg->msg.msg_name)
async_msg->msg.msg_name = &async_msg->addr;
if ((req->flags & REQ_F_BUFFER_SELECT) && !async_msg->msg.msg_iter.nr_segs)
return -EAGAIN;
/* if were using fast_iov, set it to the new one */
if (iter_is_iovec(&kmsg->msg.msg_iter) && !kmsg->free_iov) {
size_t fast_idx = iter_iov(&kmsg->msg.msg_iter) - kmsg->fast_iov;
@ -542,6 +546,7 @@ static int io_recvmsg_copy_hdr(struct io_kiocb *req,
struct io_async_msghdr *iomsg)
{
iomsg->msg.msg_name = &iomsg->addr;
iomsg->msg.msg_iter.nr_segs = 0;
#ifdef CONFIG_COMPAT
if (req->ctx->compat)