From: Luis Chamberlain <mcgrof@kernel•org>
To: axboe@kernel•dk, geoff@infradead•org, mpe@ellerman•id.au,
benh@kernel•crashing.org, paulus@samba•org, jim@jtan•com,
minchan@kernel•org, ngupta@vflare•org, senozhatsky@chromium•org,
richard@nod•at, miquel.raynal@bootlin•com, vigneshr@ti•com,
dan.j.williams@intel•com, vishal.l.verma@intel•com,
dave.jiang@intel•com, ira.weiny@intel•com, kbusch@kernel•org,
hch@lst•de, sagi@grimberg•me
Cc: nvdimm@lists•linux.dev, linux-kernel@vger•kernel.org,
linux-nvme@lists•infradead.org, linux-block@vger•kernel.org,
Luis Chamberlain <mcgrof@kernel•org>,
linux-mtd@lists•infradead.org, linuxppc-dev@lists•ozlabs.org
Subject: [PATCH 06/13] nvdimm/blk: avoid calling del_gendisk() on early failures
Date: Fri, 15 Oct 2021 16:52:12 -0700 [thread overview]
Message-ID: <20211015235219.2191207-7-mcgrof@kernel.org> (raw)
In-Reply-To: <20211015235219.2191207-1-mcgrof@kernel.org>
If nd_integrity_init() fails we'd get del_gendisk() called,
but that's not correct as we should only call that if we're
done with device_add_disk(). Fix this by providing unwinding
prior to the devm call being registered and moving the devm
registration to the very end.
This should fix calling del_gendisk() if nd_integrity_init()
fails. I only spotted this issue through code inspection. It
does not fix any real world bug.
Signed-off-by: Luis Chamberlain <mcgrof@kernel•org>
---
drivers/nvdimm/blk.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/nvdimm/blk.c b/drivers/nvdimm/blk.c
index 088d3dd6f6fa..591fa1f86f1e 100644
--- a/drivers/nvdimm/blk.c
+++ b/drivers/nvdimm/blk.c
@@ -240,6 +240,7 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk)
resource_size_t available_disk_size;
struct gendisk *disk;
u64 internal_nlba;
+ int rc;
internal_nlba = div_u64(nsblk->size, nsblk_internal_lbasize(nsblk));
available_disk_size = internal_nlba * nsblk_sector_size(nsblk);
@@ -256,20 +257,26 @@ static int nsblk_attach_disk(struct nd_namespace_blk *nsblk)
blk_queue_logical_block_size(disk->queue, nsblk_sector_size(nsblk));
blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
- if (devm_add_action_or_reset(dev, nd_blk_release_disk, disk))
- return -ENOMEM;
-
if (nsblk_meta_size(nsblk)) {
- int rc = nd_integrity_init(disk, nsblk_meta_size(nsblk));
+ rc = nd_integrity_init(disk, nsblk_meta_size(nsblk));
if (rc)
- return rc;
+ goto out_before_devm_err;
}
set_capacity(disk, available_disk_size >> SECTOR_SHIFT);
device_add_disk(dev, disk, NULL);
+
+ /* nd_blk_release_disk() is called if this fails */
+ if (devm_add_action_or_reset(dev, nd_blk_release_disk, disk))
+ return -ENOMEM;
+
nvdimm_check_and_set_ro(disk);
return 0;
+
+out_before_devm_err:
+ blk_cleanup_disk(disk);
+ return rc;
}
static int nd_blk_probe(struct device *dev)
--
2.30.2
next prev parent reply other threads:[~2021-10-15 23:58 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 23:52 [PATCH 00/13] block: add_disk() error handling stragglers Luis Chamberlain
2021-10-15 23:52 ` [PATCH 01/13] block/brd: add error handling support for add_disk() Luis Chamberlain
2021-10-15 23:52 ` [PATCH 02/13] nvme-multipath: " Luis Chamberlain
2021-10-16 0:01 ` Keith Busch
2021-10-16 4:39 ` Christoph Hellwig
2021-10-18 5:34 ` Chaitanya Kulkarni
2021-10-15 23:52 ` [PATCH 03/13] nvdimm/btt: do not call del_gendisk() if not needed Luis Chamberlain
2021-10-31 17:47 ` Dan Williams
2021-11-02 17:03 ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 04/13] nvdimm/btt: use goto error labels on btt_blk_init() Luis Chamberlain
2021-10-31 17:51 ` Dan Williams
2021-10-15 23:52 ` [PATCH 05/13] nvdimm/btt: add error handling support for add_disk() Luis Chamberlain
2021-10-15 23:52 ` Luis Chamberlain [this message]
2021-10-16 0:13 ` [PATCH 06/13] nvdimm/blk: avoid calling del_gendisk() on early failures Dan Williams
2021-10-19 16:06 ` Luis Chamberlain
2021-11-03 0:10 ` Luis Chamberlain
2021-11-03 0:49 ` Dan Williams
2021-11-03 1:28 ` Jens Axboe
2021-11-03 12:09 ` Luis Chamberlain
2021-11-03 12:08 ` Luis Chamberlain
2021-10-15 23:52 ` [PATCH 07/13] nvdimm/blk: add error handling support for add_disk() Luis Chamberlain
2021-10-15 23:52 ` [PATCH 08/13] zram: " Luis Chamberlain
2021-10-25 16:55 ` Minchan Kim
2021-10-15 23:52 ` [PATCH 09/13] z2ram: " Luis Chamberlain
2021-10-15 23:52 ` [PATCH 10/13] ps3disk: " Luis Chamberlain
2021-10-29 15:05 ` Geoff Levand
2021-10-15 23:52 ` [PATCH 11/13] ps3vram: " Luis Chamberlain
2021-10-29 15:09 ` Geoff Levand
2021-10-15 23:52 ` [PATCH 12/13] block/sunvdc: " Luis Chamberlain
2021-10-15 23:52 ` [PATCH 13/13] mtd/ubi/block: " Luis Chamberlain
2021-10-17 15:26 ` [PATCH 00/13] block: add_disk() error handling stragglers Geoff Levand
2021-10-18 16:15 ` Luis Chamberlain
2021-10-22 3:10 ` Geoff Levand
2021-10-25 15:58 ` Luis Chamberlain
2021-10-30 17:03 ` (subset) " Jens Axboe
2021-10-30 17:07 ` Jens Axboe
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=20211015235219.2191207-7-mcgrof@kernel.org \
--to=mcgrof@kernel$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=benh@kernel$(echo .)crashing.org \
--cc=dan.j.williams@intel$(echo .)com \
--cc=dave.jiang@intel$(echo .)com \
--cc=geoff@infradead$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=ira.weiny@intel$(echo .)com \
--cc=jim@jtan$(echo .)com \
--cc=kbusch@kernel$(echo .)org \
--cc=linux-block@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mtd@lists$(echo .)infradead.org \
--cc=linux-nvme@lists$(echo .)infradead.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=minchan@kernel$(echo .)org \
--cc=miquel.raynal@bootlin$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=ngupta@vflare$(echo .)org \
--cc=nvdimm@lists$(echo .)linux.dev \
--cc=paulus@samba$(echo .)org \
--cc=richard@nod$(echo .)at \
--cc=sagi@grimberg$(echo .)me \
--cc=senozhatsky@chromium$(echo .)org \
--cc=vigneshr@ti$(echo .)com \
--cc=vishal.l.verma@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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