Skip to content

Commit 3a654ee

Browse files
committed
Merge tag 'block-6.17-20250925' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux
Pull block fixes from Jens Axboe: "A regression fix for this series where an attempt to silence an EOD error got messed up a bit, and then a change of git trees for the block and io_uring trees. Switching the git trees to kernel.org now, as I've just about had it trying to battle AI bots that bring the box to its knees, continually. At least I don't have to maintain the kernel.org side" * tag 'block-6.17-20250925' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux: MAINTAINERS: update io_uring and block tree git trees block: fix EOD return for device with nr_sectors == 0
2 parents 3170244 + 285213a commit 3a654ee

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6221,7 +6221,7 @@ M: Josef Bacik <josef@toxicpanda.com>
62216221
M: Jens Axboe <axboe@kernel.dk>
62226222
L: cgroups@vger.kernel.org
62236223
L: linux-block@vger.kernel.org
6224-
T: git git://git.kernel.dk/linux-block
6224+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git
62256225
F: Documentation/admin-guide/cgroup-v1/blkio-controller.rst
62266226
F: block/bfq-cgroup.c
62276227
F: block/blk-cgroup.c
@@ -12876,8 +12876,8 @@ IO_URING
1287612876
M: Jens Axboe <axboe@kernel.dk>
1287712877
L: io-uring@vger.kernel.org
1287812878
S: Maintained
12879-
T: git git://git.kernel.dk/linux-block
12880-
T: git git://git.kernel.dk/liburing
12879+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git
12880+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git
1288112881
F: include/linux/io_uring/
1288212882
F: include/linux/io_uring.h
1288312883
F: include/linux/io_uring_types.h

block/blk-core.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,9 +557,11 @@ static inline int bio_check_eod(struct bio *bio)
557557
sector_t maxsector = bdev_nr_sectors(bio->bi_bdev);
558558
unsigned int nr_sectors = bio_sectors(bio);
559559

560-
if (nr_sectors && maxsector &&
560+
if (nr_sectors &&
561561
(nr_sectors > maxsector ||
562562
bio->bi_iter.bi_sector > maxsector - nr_sectors)) {
563+
if (!maxsector)
564+
return -EIO;
563565
pr_info_ratelimited("%s: attempt to access beyond end of device\n"
564566
"%pg: rw=%d, sector=%llu, nr_sectors = %u limit=%llu\n",
565567
current->comm, bio->bi_bdev, bio->bi_opf,

0 commit comments

Comments
 (0)