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

Commit 1d269061 authored by Chengguang Xu's avatar Chengguang Xu Committed by Greg Kroah-Hartman
Browse files

block: release bip in a right way in error path 



[ Upstream commit 0b8eb629a700c0ef15a437758db8255f8444e76c ]

Release bip using kfree() in error path when that was allocated
by kmalloc().

Signed-off-by: default avatarChengguang Xu <cgxu519@mykernel.net>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cc1815b7

block/bio-integrity.c

+14 −9
Original line number Diff line number Diff line
@@ -38,6 +38,18 @@ void blk_flush_integrity(void) 
	flush_workqueue(kintegrityd_wq);

}



void __bio_integrity_free(struct bio_set *bs, struct bio_integrity_payload *bip)

{

	if (bs && mempool_initialized(&bs->bio_integrity_pool)) {

		if (bip->bip_vec)

			bvec_free(&bs->bvec_integrity_pool, bip->bip_vec,

				  bip->bip_slab);

		mempool_free(bip, &bs->bio_integrity_pool);

	} else {

		kfree(bip);

	}

}



/**

 * bio_integrity_alloc - Allocate integrity payload and attach it to bio

 * @bio:	bio to attach integrity metadata to
@@ -90,7 +102,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, 


	return bip;

err:

	mempool_free(bip, &bs->bio_integrity_pool);

	__bio_integrity_free(bs, bip);

	return ERR_PTR(-ENOMEM);

}

EXPORT_SYMBOL(bio_integrity_alloc);
@@ -111,14 +123,7 @@ static void bio_integrity_free(struct bio *bio) 
		kfree(page_address(bip->bip_vec->bv_page) +

		      bip->bip_vec->bv_offset);



	if (bs && mempool_initialized(&bs->bio_integrity_pool)) {

		bvec_free(&bs->bvec_integrity_pool, bip->bip_vec, bip->bip_slab);



		mempool_free(bip, &bs->bio_integrity_pool);

	} else {

		kfree(bip);

	}



	__bio_integrity_free(bs, bip);

	bio->bi_integrity = NULL;

	bio->bi_opf &= ~REQ_INTEGRITY;

}