From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Chengguang Xu <cgxu519@mykernel.net>,
Christoph Hellwig <hch@lst.de>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Jens Axboe <axboe@kernel.dk>, Sasha Levin <sashal@kernel.org>,
linux-block@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 24/27] block: release bip in a right way in error path
Date: Wed, 1 Jul 2020 21:26:12 -0400 [thread overview]
Message-ID: <20200702012615.2701532-24-sashal@kernel.org> (raw)
In-Reply-To: <20200702012615.2701532-1-sashal@kernel.org>
From: Chengguang Xu <cgxu519@mykernel.net>
[ Upstream commit 0b8eb629a700c0ef15a437758db8255f8444e76c ]
Release bip using kfree() in error path when that was allocated
by kmalloc().
Signed-off-by: Chengguang Xu <cgxu519@mykernel.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
block/bio-integrity.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/block/bio-integrity.c b/block/bio-integrity.c
index 5bd90cd4b51e3..d3ef211d006ef 100644
--- a/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@ -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;
}
--
2.25.1
next prev parent reply other threads:[~2020-07-02 1:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 1:25 [PATCH AUTOSEL 4.19 01/27] regmap: fix alignment issue Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 02/27] ARM: dts: omap4-droid4: Fix spi configuration and increase rate Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 03/27] drm/tegra: hub: Do not enable orphaned window group Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 04/27] gpu: host1x: Detach driver on unregister Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 05/27] btrfs: use kfree() in btrfs_ioctl_get_subvol_info() Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 06/27] net: usb: ax88179_178a: fix packet alignment padding Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 07/27] usb: usbtest: fix missing kfree(dev->buf) in usbtest_disconnect Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 08/27] spi: spidev: fix a race between spidev_release and spidev_remove Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 09/27] spi: spidev: fix a potential use-after-free in spidev_release() Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 10/27] tg3: driver sleeps indefinitely when EEH errors exceed eeh_max_freezes Sasha Levin
2020-07-02 1:25 ` [PATCH AUTOSEL 4.19 11/27] ixgbe: protect ring accesses with READ- and WRITE_ONCE Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 12/27] i40e: " Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 13/27] usbnet: smsc95xx: Fix use-after-free after removal Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 14/27] drm: panel-orientation-quirks: Add quirk for Asus T101HA panel Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 15/27] drm: panel-orientation-quirks: Use generic orientation-data for Acer S1003 Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 16/27] s390/kasan: fix early pgm check handler execution Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 17/27] s390/debug: avoid kernel warning on too large number of pages Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 18/27] cifs: Fix double add page to memcg when cifs_readpages Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 19/27] drm/sun4i: mixer: Call of_dma_configure if there's an IOMMU Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 20/27] cifs: update ctime and mtime during truncate Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 21/27] ARM: imx6: add missing put_device() call in imx6q_suspend_init() Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 22/27] scsi: mptscsih: Fix read sense data size Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 23/27] usb: dwc3: pci: Fix reference count leak in dwc3_pci_resume_work Sasha Levin
2020-07-02 1:26 ` Sasha Levin [this message]
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 25/27] nvme-rdma: assign completion vector correctly Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 26/27] x86/entry: Increase entry_stack size to a full page Sasha Levin
2020-07-02 1:26 ` [PATCH AUTOSEL 4.19 27/27] kgdb: Avoid suspicious RCU usage warning Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200702012615.2701532-24-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@kernel.dk \
--cc=cgxu519@mykernel.net \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox