summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2017-09-26 11:41:28 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-30 08:39:07 +0000
commit6e83c891b68aa1f27a20489dfde38b189738bf8a (patch)
tree0c9802c16d7b78105afeff9c9ea7a4ff3113d074 /drivers/nvdimm
parent2224973f18dcbb7b2f01fc20a40e28b7faf73140 (diff)
downloadlinux-stable-6e83c891b68aa1f27a20489dfde38b189738bf8a.tar.gz
linux-stable-6e83c891b68aa1f27a20489dfde38b189738bf8a.tar.bz2
linux-stable-6e83c891b68aa1f27a20489dfde38b189738bf8a.zip
libnvdimm, namespace: fix label initialization to use valid seq numbers
commit b18d4b8a25af6fe83d7692191d6ff962ea611c4f upstream. The set of valid sequence numbers is {1,2,3}. The specification indicates that an implementation should consider 0 a sign of a critical error: UEFI 2.7: 13.19 NVDIMM Label Protocol Software never writes the sequence number 00, so a correctly check-summed Index Block with this sequence number probably indicates a critical error. When software discovers this case it treats it as an invalid Index Block indication. While the expectation is that the invalid block is just thrown away, the Robustness Principle says we should fix this to make both sequence numbers valid. Fixes: f524bf271a5c ("libnvdimm: write pmem label set") Reported-by: Juston Li <juston.li@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nvdimm')
-rw-r--r--drivers/nvdimm/label.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
index fac7cabe8f56..d8d189d14834 100644
--- a/drivers/nvdimm/label.c
+++ b/drivers/nvdimm/label.c
@@ -861,7 +861,7 @@ static int init_labels(struct nd_mapping *nd_mapping, int num_labels)
nsindex = to_namespace_index(ndd, 0);
memset(nsindex, 0, ndd->nsarea.config_size);
for (i = 0; i < 2; i++) {
- int rc = nd_label_write_index(ndd, i, i*2, ND_NSINDEX_INIT);
+ int rc = nd_label_write_index(ndd, i, 3 - i, ND_NSINDEX_INIT);
if (rc)
return rc;