Commit 00444238 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1f342790 d6fef34e

io_uring/fs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

io_uring/rsrc.c

+1 −1
Original line number Diff line number Diff line
@@ -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