virtio-blk: clamp zone report to the report buffer capacity
Subsystems (3)
PATCH v2 1/1 virtio-blk: clamp zone report to the report buffer capacity
virtblk_report_zones() trusts the device-reported number of zones when walking the report buffer:
nz = min_t(u64, virtio64_to_cpu(vblk->vdev, report->nr_zones),
nr_zones);
...
for (i = 0; i < nz && zone_idx < nr_zones; i++) {
ret = virtblk_parse_zone(vblk, &report->zones[i], ...);The buffer is allocated by virtblk_alloc_report_buffer(), whose size is capped by the queue's max hardware sectors and max segments and can therefore hold fewer descriptors than nr_zones. nz is bounded only by the device-supplied report->nr_zones and the requested nr_zones, never by the buffer's descriptor capacity. At probe time the request count is unbounded (blk_revalidate_disk_zones() calls report_zones() with nr_zones == UINT_MAX), so the device-supplied report->nr_zones is the sole gate: a device that reports more zones than fit in the buffer drives the loop to read report->zones[i] past the end of the allocation.
A malicious or buggy virtio-blk device that reports an inflated nr_zones triggers this during zone revalidation at probe. KASAN reports a vmalloc-out-of-bounds read in virtblk_report_zones() against the report buffer allocated a few lines earlier.
Clamp nz to the number of descriptors that actually fit in the report buffer.
---
v2: drop the explanatory comment per Michael S. Tsirkin's review; the
clamp itself is unchanged.
drivers/block/virtio_blk.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/block/virtio_blk.c +2 -0
@@ -689,6 +689,8 @@ static int virtblk_report_zones(struct gendisk *disk, sector_t sector, nz =min_t (u64,virtio64_to_cpu (vblk->vdev, report->nr_zones), nr_zones); + nz =min_t (u64, nz, + (buflen -sizeof (*report)) /sizeof (report->zones[0 ]));if (!nz)break ;
base-commit: 5200f5f493f79f14bbdc349e402a40dfb32f23c8
Signature · 1 line
2.53.0
Quoted 30 lines · Michael Bommarito
virtblk_report_zones()trusts the device-reported number of zones when walking the report buffer:nz = min_t(u64, virtio64_to_cpu(vblk->vdev, report->nr_zones), nr_zones); ... for (i = 0; i < nz && zone_idx < nr_zones; i++) { ret = virtblk_parse_zone(vblk, &report->zones[i], ...);The buffer is allocated by
virtblk_alloc_report_buffer(), whose size is capped by the queue's max hardware sectors and max segments and can therefore hold fewer descriptors thannr_zones. nz is bounded only by the device-suppliedreport->nr_zonesand the requestednr_zones, never by the buffer's descriptor capacity. At probe time the request count is unbounded (blk_revalidate_disk_zones()callsreport_zones()withnr_zones==UINT_MAX), so the device-suppliedreport->nr_zonesis the sole gate: a device that reports more zones than fit in the buffer drives the loop to read report->zones[i] past the end of the allocation.A malicious or buggy virtio-blk device that reports an inflated
nr_zonestriggers this during zone revalidation at probe. KASAN reports a vmalloc-out-of-bounds read invirtblk_report_zones()against the report buffer allocated a few lines earlier.Clamp nz to the number of descriptors that actually fit in the report buffer.
Fixes 95bfec41bd3d ("virtio-blk: add support for zoned block devices")Assisted-by Claude:claude-opus-4-8Signed-off-by Michael Bommarito <[email protected]>
Quoted 6 lines
---
v2: drop the explanatory comment per Michael S. Tsirkin's review; the
clamp itself is unchanged.drivers/block/virtio_blk.c | 2 ++ 1 file changed, 2 insertions(+)
Quoted 24 lines · Michael Bommarito
virtblk_report_zones()trusts the device-reported number of zones when walking the report buffer:nz = min_t(u64, virtio64_to_cpu(vblk->vdev, report->nr_zones), nr_zones); ... for (i = 0; i < nz && zone_idx < nr_zones; i++) { ret = virtblk_parse_zone(vblk, &report->zones[i], ...);The buffer is allocated by
virtblk_alloc_report_buffer(), whose size is capped by the queue's max hardware sectors and max segments and can therefore hold fewer descriptors thannr_zones. nz is bounded only by the device-suppliedreport->nr_zonesand the requestednr_zones, never by the buffer's descriptor capacity. At probe time the request count is unbounded (blk_revalidate_disk_zones()callsreport_zones()withnr_zones==UINT_MAX), so the device-suppliedreport->nr_zonesis the sole gate: a device that reports more zones than fit in the buffer drives the loop to read report->zones[i] past the end of the allocation.A malicious or buggy virtio-blk device that reports an inflated
nr_zonestriggers this during zone revalidation at probe. KASAN reports a vmalloc-out-of-bounds read invirtblk_report_zones()against the report buffer allocated a few lines earlier.
Quoted 6 lines
Clamp nz to the number of descriptors that actually fit in the report buffer.
Fixes 95bfec41bd3d ("virtio-blk: add support for zoned block devices")Assisted-by Claude:claude-opus-4-8Signed-off-by Michael Bommarito <[email protected]>
Quoted 24 lines
---
v2: drop the explanatory comment per Michael S. Tsirkin's review; the
clamp itself is unchanged.drivers/block/virtio_blk.c | 2 ++ 1 file changed, 2 insertions(+)drivers/block/virtio_blk.c +2
-0@@ -689,6 +689,8 @@ static int virtblk_report_zones(struct gendisk *disk, sector_t sector, nz =min_t (u64,virtio64_to_cpu (vblk->vdev, report->nr_zones), nr_zones); + nz =min_t (u64, nz, + (buflen -sizeof (*report)) /sizeof (report->zones[0 ]));if (!nz)break ;base-commit:
5200f5f493f79f14bbdc349e402a40dfb32f23c8Signature · 1 line
2.53.0
Quoted 10 lines · Michael Bommarito
virtblk_report_zones()trusts the device-reported number of zones when walking the report buffer:nz = min_t(u64, virtio64_to_cpu(vblk->vdev, report->nr_zones), nr_zones); ... for (i = 0; i < nz && zone_idx < nr_zones; i++) { ret = virtblk_parse_zone(vblk, &report->zones[i], ...);[...]
Applied, thanks!
[1/1] virtio-blk: clamp zone report to the report buffer capacity
commit: 0fd835f5e9477ebea2439b8ada58f34e1b8cf25a
Best regards,
Signature · 1 line
Jens Axboe