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
Unified · Split
| @@ -6221,7 +6221,7 @@ M: Josef Bacik <josef@toxicpanda.com> · 6220 unmodified lines | ||
| 6221 | 6221 | M: Jens Axboe <axboe@kernel.dk> |
| 6222 | 6222 | L: cgroups@vger.kernel.org |
| 6223 | 6223 | 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 | |
| 6225 | 6225 | F: Documentation/admin-guide/cgroup-v1/blkio-controller.rst |
| 6226 | 6226 | F: block/bfq-cgroup.c |
| 6227 | 6227 | F: block/blk-cgroup.c |
| @@ -12876,8 +12876,8 @@ IO_URING · 6648 unmodified lines | ||
| 12876 | 12876 | M: Jens Axboe <axboe@kernel.dk> |
| 12877 | 12877 | L: io-uring@vger.kernel.org |
| 12878 | 12878 | 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 | |
| 12881 | 12881 | F: include/linux/io_uring/ |
| 12882 | 12882 | F: include/linux/io_uring.h |
| 12883 | 12883 | F: include/linux/io_uring_types.h |
| @@ -557,9 +557,11 @@ static inline int bio_check_eod(struct bio *bio) · 556 unmodified lines | ||
| 557 | 557 | sector_t maxsector = bdev_nr_sectors(bio->bi_bdev); |
| 558 | 558 | unsigned int nr_sectors = bio_sectors(bio); |
| 559 | 559 | |
| 560 | − if (nr_sectors && maxsector && | |
| 560 | + if (nr_sectors && | |
| 561 | 561 | (nr_sectors > maxsector || |
| 562 | 562 | bio->bi_iter.bi_sector > maxsector - nr_sectors)) { |
| 563 | + if (!maxsector) | |
| 564 | + return -EIO; | |
| 563 | 565 | pr_info_ratelimited("%s: attempt to access beyond end of device\n" |
| 564 | 566 | "%pg: rw=%d, sector=%llu, nr_sectors = %u limit=%llu\n", |
| 565 | 567 | current->comm, bio->bi_bdev, bio->bi_opf, |