Skip to content

Commit 0044423

Browse files
committed
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
2 parents 1f34279 + d6fef34 commit 0044423

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

io_uring/fs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ int io_linkat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
254254
newf = u64_to_user_ptr(READ_ONCE(sqe->addr2));
255255
lnk->flags = READ_ONCE(sqe->hardlink_flags);
256256

257-
lnk->oldpath = getname(oldf);
257+
lnk->oldpath = getname_uflags(oldf, lnk->flags);
258258
if (IS_ERR(lnk->oldpath))
259259
return PTR_ERR(lnk->oldpath);
260260

io_uring/rsrc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ int io_import_fixed(int ddir, struct iov_iter *iter,
12581258
*/
12591259
const struct bio_vec *bvec = imu->bvec;
12601260

1261-
if (offset <= bvec->bv_len) {
1261+
if (offset < bvec->bv_len) {
12621262
/*
12631263
* Note, huge pages buffers consists of one large
12641264
* bvec entry and should always go this way. The other

0 commit comments

Comments
 (0)