From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Wed, 15 Feb 2023 12:18:01 -0500
Subject: block: bio-integrity: Copy flags when bio_integrity_payload is cloned
Patch-mainline: v6.3-rc1
Git-commit: b6a4bdcda430e3ca43bbb9cb1d4d4d34ebe15c40
References: bsc#1208541

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>
Acked-by: Daniel Wagner <dwagner@suse.de>
---
 block/bio-integrity.c |    1 +
 1 file changed, 1 insertion(+)

--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -435,6 +435,7 @@ int bio_integrity_clone(struct bio *bio,
 
 	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;
 }