summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJane Chu <jane.chu@oracle.com>2020-08-03 16:41:37 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-21 13:15:13 +0200
commite5896827b71ab0c52bea3dc8df8202afe11ce312 (patch)
treed9b6462f69e14d00e725a29db53bdf6e33242afd
parent8d4e102a6e426c84aa511c6f813745edbf85e45e (diff)
downloadlinux-stable-e5896827b71ab0c52bea3dc8df8202afe11ce312.tar.gz
linux-stable-e5896827b71ab0c52bea3dc8df8202afe11ce312.tar.bz2
linux-stable-e5896827b71ab0c52bea3dc8df8202afe11ce312.zip
libnvdimm/security: fix a typo
[ Upstream commit dad42d17558f316e9e807698cd4207359b636084 ] commit d78c620a2e82 ("libnvdimm/security: Introduce a 'frozen' attribute") introduced a typo, causing a 'nvdimm->sec.flags' update being overwritten by the subsequent update meant for 'nvdimm->sec.ext_flags'. Link: https://lore.kernel.org/r/1596494499-9852-1-git-send-email-jane.chu@oracle.com Fixes: d78c620a2e82 ("libnvdimm/security: Introduce a 'frozen' attribute") Cc: Dan Williams <dan.j.williams@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Jane Chu <jane.chu@oracle.com> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/nvdimm/security.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c
index 4cef69bd3c1b..8f3971cf1654 100644
--- a/drivers/nvdimm/security.c
+++ b/drivers/nvdimm/security.c
@@ -457,7 +457,7 @@ void __nvdimm_security_overwrite_query(struct nvdimm *nvdimm)
clear_bit(NDD_WORK_PENDING, &nvdimm->flags);
put_device(&nvdimm->dev);
nvdimm->sec.flags = nvdimm_security_flags(nvdimm, NVDIMM_USER);
- nvdimm->sec.flags = nvdimm_security_flags(nvdimm, NVDIMM_MASTER);
+ nvdimm->sec.ext_flags = nvdimm_security_flags(nvdimm, NVDIMM_MASTER);
}
void nvdimm_security_overwrite_query(struct work_struct *work)