iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

io_uring-6.10-20240703

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmaFVo0QHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgptHDEACB+g4or5yQNnfhoNiwgQhP3I5A/xtPhz9i
 QtItzjUnUiRiTkl127Fw7BNwu2TVs+T/CeEORBsC4g8LsaDKAh4zT/xYG5uUhcMi
 riVh62oIbFfAznOi3QCG5eTG2hQJGwAXgiao8YFEHhwZ8KQbztIP9y7DfTjydPet
 umgqrc/IMju6afgUvP3Fcuff7UkeFzRRbVKguj73M+Ua3lwjkGCm57GprPv6t82R
 Ac+OMo4RTsrM/95pdf3PMwXXAk3+otjSqMtMPoz4IKMLaEpOaszsgAZWl/bSENTa
 NXPu+YQYMdr1S00UIWYqX3NVx7s0QwvYKPtVj54e/YdEFFNm8H3jDUQpVOlpKQBd
 uGf5vT3WofUcLXXVkhPXjyNfZVUJla4cR0mM9oE5gSVU1pu7FHpyFNH1NCoId6//
 XL7HXmxCd5tdRFOa8CjuN5+4askpfvuSEAaYFXA825QRv+Wtuo6z7rBJWlYzIMBW
 zvVvK8SZIaPmPAZorL8JPdc9sY+pr22AG7oiZqQ5Mc/m9Kz1lRYFdcPQlQKQPccm
 O6DYP+j4k4uvKq27i/v2sAzC1VPKdQ+VGUpkK58eVLXFWIVieqA/Ji8VRi04FHrE
 fh0ESyJyQIsNEszGC0a+U9qn6ROm8123Tz8rplkfYZaOVO1uD4xh1Hpfuii2SSre
 Ey5ER8OJ9w==
 =lvk+
 -----END PGP SIGNATURE-----

Merge tag 'io_uring-6.10-20240703' of git://git.kernel.dk/linux

Pull io_uring fix from Jens Axboe:
 "A fix for a feature that went into the 6.10 merge window actually
  ended up causing a regression in building bundles for receives.

  Fix that up by ensuring we don't overwrite msg_inq before we use
  it in the loop"

* tag 'io_uring-6.10-20240703' of git://git.kernel.dk/linux:
  io_uring/net: don't clear msg_inq before io_recv_buf_select() needs it
This commit is contained in:
Linus Torvalds 2024-07-03 10:16:54 -07:00
commit 8a9c6c4043
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
io_uring/net.c
View File

@ -1127,16 +1127,18 @@ int io_recv(struct io_kiocb *req, unsigned int issue_flags)
flags |= MSG_DONTWAIT;
retry_multishot:
kmsg->msg.msg_inq = -1;
kmsg->msg.msg_flags = 0;
if (io_do_buffer_select(req)) {
ret = io_recv_buf_select(req, kmsg, &len, issue_flags);
if (unlikely(ret))
if (unlikely(ret)) {
kmsg->msg.msg_inq = -1;
goto out_free;
}
sr->buf = NULL;
}
kmsg->msg.msg_flags = 0;
kmsg->msg.msg_inq = -1;
if (flags & MSG_WAITALL)
min_ret = iov_iter_count(&kmsg->msg.msg_iter);