From: Christoph Hellwig <hch@lst.de>
Date: Mon, 29 Nov 2021 10:21:35 +0000 (+0100)
Subject: dm: fix alloc_dax error handling in alloc_dev
X-Git-Tag: block-5.17-2022-01-21~22^2~36
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d751939235b9b7bc4af15f90a3e99288a8b844a7;p=linux-block.git

dm: fix alloc_dax error handling in alloc_dev

Make sure ->dax_dev is NULL on error so that the cleanup path doesn't
trip over an ERR_PTR.

Reported-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20211129102203.2243509-2-hch@lst.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 662742a310cb..acc84dc1bded 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1786,8 +1786,10 @@ static struct mapped_device *alloc_dev(int minor)
 	if (IS_ENABLED(CONFIG_DAX_DRIVER)) {
 		md->dax_dev = alloc_dax(md, md->disk->disk_name,
 					&dm_dax_ops, 0);
-		if (IS_ERR(md->dax_dev))
+		if (IS_ERR(md->dax_dev)) {
+			md->dax_dev = NULL;
 			goto bad;
+		}
 	}
 
 	format_dev_t(md->name, MKDEV(_major, minor));