[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <153869739732.2904401.10895695693942634646.stgit@dwillia2-desk3.amr.corp.intel.com>
Date: Thu, 04 Oct 2018 16:56:37 -0700
From: Dan Williams <dan.j.williams@...el.com>
To: linux-nvdimm@...ts.01.org
Cc: stable@...r.kernel.org, Christoph Hellwig <hch@....de>,
Jacek Zloch <jacek.zloch@...el.com>,
Krzysztof Rusocki <krzysztof.rusocki@...el.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH] libnvdimm,
pmem: Fix badblocks population for 'raw' namespaces
The driver is only initializing bb_res in the devm_memremap_pages()
paths, but the raw namespace case is passing an uninitialized bb_res to
nvdimm_badblocks_populate().
Fixes: e8d513483300 ("memremap: change devm_memremap_pages interface...")
Cc: <stable@...r.kernel.org>
Cc: Christoph Hellwig <hch@....de>
Reported-by: Jacek Zloch <jacek.zloch@...el.com>
Reported-by: Krzysztof Rusocki <krzysztof.rusocki@...el.com>
Signed-off-by: Dan Williams <dan.j.williams@...el.com>
---
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 6071e2942053..2082ae01b9c8 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -421,9 +421,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, &nsio->res, sizeof(bb_res));
+ }
/*
* At release time the queue must be frozen before
Powered by blists - more mailing lists