Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfb5d727 authored by Jane Chu's avatar Jane Chu Committed by Greg Kroah-Hartman
Browse files

libnvdimm/security: fix a typo 

[ Upstream commit dad42d17558f316e9e807698cd4207359b636084 ]

commit d78c620a ("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: d78c620a ("libnvdimm/security: Introduce a 'frozen' attribute")
Cc: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarJane Chu <jane.chu@oracle.com>
Signed-off-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0c51d8f5

drivers/nvdimm/security.c

+1 −1
Original line number Diff line number Diff line
@@ -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)