Commit c31898c8 authored Apr 06, 2018 by Dan Williams

libnvdimm, dimm: fix dpa reservation vs uninitialized label area



At initialization time the 'dimm' driver caches a copy of the memory
device's label area and reserves address space for each of the
namespaces defined.

However, as can be seen below, the reservation occurs even when the
index blocks are invalid:

 nvdimm nmem0: nvdimm_init_config_data: len: 131072 rc: 0
 nvdimm nmem0: config data size: 131072
 nvdimm nmem0: __nd_label_validate: nsindex0 labelsize 1 invalid
 nvdimm nmem0: __nd_label_validate: nsindex1 labelsize 1 invalid
 nvdimm nmem0: : pmem-6025e505: 0x1000000000 @ 0xf50000000 reserve <-- bad

Gate dpa reservation on the presence of valid index blocks.

Cc: <stable@vger.kernel.org>
Fixes: 4a826c83 ("libnvdimm: namespace indices: read and validate")
Reported-by: Krzysztof Rusocki <krzysztof.rusocki@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

parent f6adcca0

drivers/nvdimm/dimm.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -67,9 +67,11 @@ static int nvdimm_probe(struct device *dev)
		ndd->ns_next = nd_label_next_nsindex(ndd->ns_current);
		nd_label_copy(ndd, to_next_namespace_index(ndd),
		to_current_namespace_index(ndd));
		if (ndd->ns_current >= 0) {
		rc = nd_label_reserve_dpa(ndd);
		if (ndd->ns_current >= 0)
		if (rc == 0)
		nvdimm_set_aliasing(dev);
		}
		nvdimm_clear_locked(dev);
		nvdimm_bus_unlock(dev);

Admin message