Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82d68c32 authored by Martin K. Petersen's avatar Martin K. Petersen Committed by Greg Kroah-Hartman
Browse files

block: bio-integrity: Copy flags when bio_integrity_payload is cloned 



[ Upstream commit b6a4bdcda430e3ca43bbb9cb1d4d4d34ebe15c40 ]

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: aae7df50 ("block: Integrity checksum flag")
Fixes: b1f01388 ("block: Relocate bio integrity flags")
Reported-by: default avatarSaurav Kashyap <skashyap@marvell.com>
Tested-by: default avatarSaurav Kashyap <skashyap@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20230215171801.21062-1-martin.petersen@oracle.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 084cd756

block/bio-integrity.c

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,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;

}