VisionFive2 Linux kernel

author: Jane Chu <jane.chu@oracle.com> 2020-08-03 16:41:38 -0600 committer: Vishal Verma <vishal.l.verma@intel.com> 2020-08-03 18:54:13 -0600 commit: 7c02d53dfe4db08cd7b4d4be8c7f1b801cf8b899 parent: dad42d17558f316e9e807698cd4207359b636084

Commit Summary:

libnvdimm/security: the 'security' attr never show 'overwrite' state

Diffstat:

1 file changed, 2 insertions, 2 deletions

diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c
index 2f0815e15986..61374def5155 100644
--- a/drivers/nvdimm/dimm_devs.c
+++ b/drivers/nvdimm/dimm_devs.c
@@ -363,14 +363,14 @@ __weak ssize_t security_show(struct device *dev,
 {
 	struct nvdimm *nvdimm = to_nvdimm(dev);
 
+	if (test_bit(NVDIMM_SECURITY_OVERWRITE, &nvdimm->sec.flags))
+		return sprintf(buf, "overwrite\n");
 	if (test_bit(NVDIMM_SECURITY_DISABLED, &nvdimm->sec.flags))
 		return sprintf(buf, "disabled\n");
 	if (test_bit(NVDIMM_SECURITY_UNLOCKED, &nvdimm->sec.flags))
 		return sprintf(buf, "unlocked\n");
 	if (test_bit(NVDIMM_SECURITY_LOCKED, &nvdimm->sec.flags))
 		return sprintf(buf, "locked\n");
-	if (test_bit(NVDIMM_SECURITY_OVERWRITE, &nvdimm->sec.flags))
-		return sprintf(buf, "overwrite\n");
 	return -ENOTTY;
 }