OSDN Git Service

block: bio-integrity: Copy flags when bio_integrity_payload is cloned
authorMartin K. Petersen <martin.petersen@oracle.com>
Wed, 15 Feb 2023 17:18:01 +0000 (12:18 -0500)
committerJens Axboe <axboe@kernel.dk>
Thu, 16 Feb 2023 18:05:41 +0000 (11:05 -0700)
Make sure to copy the flags when a bio_integrity_payload is cloned.
Otherwise per-I/O properties such as IP checksum flag will not be
passed down to the HBA driver. Since the integrity buffer is owned by
the original bio, the BIP_BLOCK_INTEGRITY flag needs to be masked off
to avoid a double free in the completion path.

Fixes: aae7df50190a ("block: Integrity checksum flag")
Fixes: b1f01388574c ("block: Relocate bio integrity flags")
Reported-by: Saurav Kashyap <skashyap@marvell.com>
Tested-by: Saurav Kashyap <skashyap@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20230215171801.21062-1-martin.petersen@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/bio-integrity.c

index a377606..4533eb4 100644 (file)
@@ -413,6 +413,7 @@ int bio_integrity_clone(struct bio *bio, struct bio *bio_src,
 
        bip->bip_vcnt = bip_src->bip_vcnt;
        bip->bip_iter = bip_src->bip_iter;
+       bip->bip_flags = bip_src->bip_flags & ~BIP_BLOCK_INTEGRITY;
 
        return 0;
 }