Commit 431e4004 authored by Caleb Sander Mateos's avatar Caleb Sander Mateos Committed by Jens Axboe
Browse files

bio-integrity-fs: pass data iter to bio_integrity_verify() 



bio_integrity_verify() expects the passed struct bvec_iter to be an
iterator over bio data, not integrity. So construct a separate data
bvec_iter without the bio_integrity_bytes() conversion and pass it to
bio_integrity_verify() instead of bip_iter.

Fixes: 0bde8a12 ("block: add fs_bio_integrity helpers")
Signed-off-by: default avatarCaleb Sander Mateos <csander@purestorage.com>
Reviewed-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://patch.msgid.link/20260513182924.1753582-1-csander@purestorage.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4141f46d

block/bio-integrity-fs.c

+5 −1
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ int fs_bio_integrity_verify(struct bio *bio, sector_t sector, unsigned int size) 
{

	struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);

	struct bio_integrity_payload *bip = bio_integrity(bio);

	struct bvec_iter data_iter = {

		.bi_sector	= sector,

		.bi_size	= size,

	};



	/*

	 * Reinitialize bip->bip_iter.
@@ -65,7 +69,7 @@ int fs_bio_integrity_verify(struct bio *bio, sector_t sector, unsigned int size) 
	memset(&bip->bip_iter, 0, sizeof(bip->bip_iter));

	bip->bip_iter.bi_sector = sector;

	bip->bip_iter.bi_size = bio_integrity_bytes(bi, size >> SECTOR_SHIFT);

	return blk_status_to_errno(bio_integrity_verify(bio, &bip->bip_iter));

	return blk_status_to_errno(bio_integrity_verify(bio, &data_iter));

}



static int __init fs_bio_integrity_init(void)