[PATCH] nvdimm/pmem: Fix disk resource cleanup on initialization failure

From: mdshahid03

Date: Wed Nov 04 2026 - 11:27:08 EST


From: Mohammad Shahid <mdshahid03@xxxxxxxxx>

pmem_attach_disk() allocates a disk using blk_alloc_disk()
before initializing badblocks.

If devm_init_badblocks() fails, the function return directly
without releasing the previously allocated disk.

Use the existing cleanup path to release the disk and preserve
the original error code returned by devm_init_badblocks().

Signed-off-by: Mohammad Shahid <mdshahid03@xxxxxxxxx>
---
drivers/nvdimm/pmem.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 5fb86595e8bd..76e80eccc8e7 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -563,8 +563,9 @@ static int pmem_attach_disk(struct device *dev,
nvdimm_namespace_disk_name(ndns, disk->disk_name);
set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)
/ 512);
- if (devm_init_badblocks(dev, &pmem->bb))
- return -ENOMEM;
+ rc = devm_init_badblocks(dev, &pmem->bb);
+ if (rc)
+ goto out;
nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_range);
disk->bb = &pmem->bb;

--
2.43.0