io_uring-6.7-2023-11-23

-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmVfrKIQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgpu7YEAC79U5ynDhB+TfEU09JSDTFMi11hfQv5xVW
 /2o4JhMEOZzo7Si+MB1huy6VOtBsNccdf2w8ahHD+wS0NUz6nkSvZhpqhYn9T52i
 gqWF5umdaNhHTZgNwerNEMJSdQc0Ov6G8YqbkbutSoYCmuu4uf3V8aYMX5vRihWm
 A2fS6RJ8xz3yRVCiy2To2D73nnN25+gVrfPSdUKxtZZ2VDmave99aW+AhRdpS5S4
 EyTMACXi7zEKVmQwpVDKw84ZYbiGGl304zp1FxqgMi1dCeKGCRub9NjzEsyb15Ke
 999lshKUIAVAcabaSTMI3kKODA8CRzmaKi1ObtGUlGuxPaxFBXebwVS0fk6+6F5a
 RJov0bids8h5VhILScIU1xXco68FEgai0UF0l9UwMu+fAImq5rTObq4J2o6uPe3o
 fIjvALsiLATxsyIDsC0nxwW3aXaY6N46y3B2TvVv+VbENfUtdFHRFZjif8+86/Mp
 a2RuW3ulDgNUCYPv/D7c7TtTbS/dmhVhHSu+TLD8qEtk3gZms1BePgClBvbWMLyD
 +yJYijMVgOGGTzEjAx+N+C9+GhgEDh9RCIgux8QEEjCQCrAxq1pvp4D7hBm8dF52
 xdWBkMXUjgw+164YH8uCeBb5HSEXZQomiFadlenBZK2oAMt4nPxWuNtC5CxREHPT
 7Q1hDiFgvw==
 =ifVm
 -----END PGP SIGNATURE-----

Merge tag 'io_uring-6.7-2023-11-23' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
 "A fix for ensuring that LINKAT always propagates flags correctly, and
  a fix for an off-by-one in segment skipping for registered buffers.

  Both heading to stable as well"

* tag 'io_uring-6.7-2023-11-23' of git://git.kernel.dk/linux:
  io_uring: fix off-by one bvec index
  io_uring/fs: consider link->flags when getting path for LINKAT
This commit is contained in:
Linus Torvalds 2023-11-23 17:36:29 -08:00
commit 0044423844
2 changed files with 2 additions and 2 deletions

View File

@ -254,7 +254,7 @@ int io_linkat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
newf = u64_to_user_ptr(READ_ONCE(sqe->addr2));
lnk->flags = READ_ONCE(sqe->hardlink_flags);
lnk->oldpath = getname(oldf);
lnk->oldpath = getname_uflags(oldf, lnk->flags);
if (IS_ERR(lnk->oldpath))
return PTR_ERR(lnk->oldpath);

View File

@ -1258,7 +1258,7 @@ int io_import_fixed(int ddir, struct iov_iter *iter,
*/
const struct bio_vec *bvec = imu->bvec;
if (offset <= bvec->bv_len) {
if (offset < bvec->bv_len) {
/*
* Note, huge pages buffers consists of one large
* bvec entry and should always go this way. The other