[PATCH v7 07/16] block: improve blkdev_get_zone_info()
flat view
COLD30d
IN LINUX-NEXT
From: Damien Le Moal <dlemoal@kernel.org>
Date: 2026-09-08 08:58:09
Subsystem:
block layer, the rest, zoned block device (block layer) · Maintainers:
Jens Axboe, Linus Torvalds, Damien Le Moal
Revision v7 of 7 in this series; queued in linux-next as aac1472513a9 on 2026-09-15.
Revisions (7)
Add a zone state array bound check to ensure that like disk_zone_get_state(), we never attempt to access the zone state array beyond its size. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> --- block/blk-zoned.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/block/blk-zoned.c b/block/blk-zoned.c
index 14c88d11f243..93d862d44e7c 100644
--- a/block/blk-zoned.c
+++ b/block/blk-zoned.c@@ -1025,6 +1025,7 @@ int blkdev_get_zone_info(struct block_device *bdev, sector_t sector, { struct gendisk *disk = bdev->bd_disk; sector_t zone_sectors = bdev_zone_sectors(bdev); + unsigned int zno = disk_zone_no(disk, sector); struct blk_zone_wplug *zwplug; unsigned long flags; u8 *zones_state, zs;
@@ -1032,23 +1033,23 @@ int blkdev_get_zone_info(struct block_device *bdev, sector_t sector, if (!bdev_is_zoned(bdev)) return -EOPNOTSUPP; - if (sector >= get_capacity(disk)) + if (sector >= get_capacity(disk) || zno >= disk->nr_zones) return -EINVAL; memset(zone, 0, sizeof(*zone)); sector = bdev_zone_start(bdev, sector); if (!blkdev_has_cached_report_zones(bdev)) - return blkdev_report_zone_fallback(bdev, sector, zone); + goto fallback; rcu_read_lock(); zones_state = rcu_dereference(disk->zones_state); if (!disk->zone_wplugs_hash || !zones_state) { rcu_read_unlock(); - return blkdev_report_zone_fallback(bdev, sector, zone); + goto fallback; } - zs = zones_state[disk_zone_no(disk, sector)]; + zs = zones_state[zno]; zone->cond = blk_zstate_to_zone_cond(zs); if (blk_zstate_is_conv(zs)) zone->type = BLK_ZONE_TYPE_CONVENTIONAL;
@@ -1113,6 +1114,9 @@ int blkdev_get_zone_info(struct block_device *bdev, sector_t sector, disk_put_zone_wplug(zwplug); return 0; + +fallback: + return blkdev_report_zone_fallback(bdev, sector, zone); } EXPORT_SYMBOL_GPL(blkdev_get_zone_info);
--
2.55.0