Skip to contentSkip to conversation

blk-integrity: fix slab-out-of-bounds in t10_pi_verify on namespace revalidation

RFC PATCH In review Samin Y. Chowdhury 3 participants 3 messages May 31 – Aug 11 Block layer

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 blk-integrity: fix slab-out-of-bounds in t10_pi_verify on namespace revalidation

Abort early with BLK_STS_PROTECTION if a namespace revalidation changed bi->metadata_size after bio_integrity_prep() sized the allocation.

Found by FuzzNvme (Syzkaller with FEMU fuzzing framework).

When a namespace is revalidated between bio_integrity_prep() and bio_integrity_verify_fn(), the integrity profile's metadata_size may change under the in-flight bio. bio_integrity_verify_fn() re-reads the live blk_integrity via blk_get_integrity(), so blk_integrity_iterate() uses the new metadata_size as the per-interval step size against a buffer sized for the old one, advancing iter->prot_buf past the end of the allocation.

task 1:
bio_integrity_prep()

    bio_integrity_alloc_buf()
      len = bio_integrity_bytes(bi, bio_sectors(bio))   ...(1)
      bip->bip_iter.bi_size = len

task 2:
nvme_update_ns_info_block()

    blk_mq_freeze_queue()
    nvme_init_integrity()
      bi->metadata_size = head->ms                      ...(2)
    blk_mq_unfreeze_queue()

task 3:
bio_integrity_verify_fn()

    bio_integrity_verify()
      blk_integrity_iterate()
        bi = blk_get_integrity()                        ...(3)
        iter->interval_remaining = 1 << bi->interval_exp
        iter->prot_buf += bi->metadata_size per interval
        /* step size from (3), buffer sized at (1): overrun */
Fixes 8098514bd5ca ("block: always allocate integrity buffer when required")

---
When a namespace is revalidated between bio_integrity_prep() and bio_integrity_verify_fn(), the integrity profile's metadata_size may change under the in-flight bio. bio_integrity_verify_fn() re-reads the live blk_integrity via blk_get_integrity(), so blk_integrity_iterate() uses the new metadata_size as the per-interval step size against a buffer sized for the old one, advancing iter->prot_buf past the end of the allocation.

task 1:
bio_integrity_prep()

    bio_integrity_alloc_buf()
      len = bio_integrity_bytes(bi, bio_sectors(bio))   ...(1)
      bip->bip_iter.bi_size = len

task 2:
nvme_update_ns_info_block()

    blk_mq_freeze_queue()
    nvme_init_integrity()
      bi->metadata_size = head->ms                      ...(2)
    blk_mq_unfreeze_queue()

task 3:
bio_integrity_verify_fn()

    bio_integrity_verify()
      blk_integrity_iterate()
        bi = blk_get_integrity()                        ...(3)
        iter->interval_remaining = 1 << bi->interval_exp
        iter->prot_buf += bi->metadata_size per interval
        /* step size from (3), buffer sized at (1): overrun */
---
 block/bio-integrity-auto.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
block/bio-integrity-auto.c +12 -0
index 353eed632fc..b404dbaa9f8 100644
@@ -38,6 +38,18 @@ static void bio_integrity_verify_fn(struct work_struct *work)
 	struct bio_integrity_data *bid =
 		container_of(work, struct bio_integrity_data, work);
 	struct bio *bio = bid->bio;
+	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);
+
+	if (bi) {
+		unsigned int required = bio_integrity_bytes(bi, bio_sectors(bio));
+
+		if (unlikely(required > bid->bip.bip_iter.bi_size)) {
+			bio->bi_status = BLK_STS_PROTECTION;
+			bio_integrity_finish(bid);
+			bio_endio(bio);
+			return;
+		}
+	}
 
 	bio->bi_status = bio_integrity_verify(bio, &bid->saved_bio_iter);
 	bio_integrity_finish(bid);

---
base-commit: 174914ea551314c52a61713b9c4bde9e42d48073
change-id: 20260531-blk-integrity-fix-e8109008af54

Best regards,

Signature · 1 line
Samin Y. Chowdhury <[email protected]>
#1 lore raw
Quoted 7 lines · On Sun, May 31, 2026 at 06:45:07PM -0400, Samin Y. Chowdhury via B4 Relay wrote:

When a namespace is revalidated between bio_integrity_prep() and bio_integrity_verify_fn(), the integrity profile's metadata_size may change under the in-flight bio. bio_integrity_verify_fn() re-reads the live blk_integrity via blk_get_integrity(), so blk_integrity_iterate() uses the new metadata_size as the per-interval step size against a buffer sized for the old one, advancing iter->prot_buf past the end of the allocation.

I don't think changing fundamental device properies such as the LBA or integrity tag size under a live device is a good model. So instead of coming up with bandaids like this, we should probably just fail any such revalidation when there are openers instead of trying to deal with the fallout.

#2 lore raw
Quoted 5 lines · Christoph Hellwig

I don't think changing fundamental device properies such as the LBA or integrity tag size under a live device is a good model. So instead of coming up with bandaids like this, we should probably just fail any such revalidation when there are openers instead of trying to deal with the fallout.

Agreed, and sorry for the long silence. Samin and I are in the same group and I am picking this up from him. We are dropping the blk-integrity patch rather than respinning it.

Before writing anything on the nvme side I would like to get the shape right, because "fail the revalidation" can mean a few things and one of them looks worse than the splat.

If a namespace really was reformatted out of band and we refuse to adopt the new geometry, the host keeps issuing I/O with the old LBA format and metadata size to a device that has already changed underneath it. That is silent corruption rather than a KASAN report. So I assume refusing the update has to be paired with taking the namespace out of service. Did you have in mind

(a) refuse the update and mark the namespace dead, like a surprise removal,
(b) refuse only while the disk has openers and redo the revalidation on last close, or
(c) something else?

Chao