[PATCH] pmem: fix badblocks population for raw mode - Linux-stable-mirror

25 Apr 2018

pmem_attach_disk() calls nvdimm_badblocks_populate() with resource
range uninitialized in the case of raw mode.  This leads the pmem
driver to hit MCE despite of ARS reporting the range bad.
Initialize 'bb_res' for raw mode.
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface to use struct dev_pagemap")
Signed-off-by: Toshi Kani toshi.kani@hpe.com
Cc: Christoph Hellwig hch@lst.de
Cc: Dan Williams dan.j.williams@intel.com
Cc: stable@vger.kernel.org
---
 drivers/nvdimm/pmem.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 9d714926ecf5..2d7875209bce 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -367,9 +367,11 @@ static int pmem_attach_disk(struct device *dev,
    	addr = devm_memremap_pages(dev, &pmem->pgmap);
    	pmem->pfn_flags |= PFN_MAP;
    	memcpy(&bb_res, &pmem->pgmap.res, sizeof(bb_res));
-	} else
+	} else {
    	addr = devm_memremap(dev, pmem->phys_addr,
    			pmem->size, ARCH_MEMREMAP_PMEM);
+		memcpy(&bb_res, res, sizeof(bb_res));
+	}
/*
     * At release time the queue must be frozen before

    