| Message ID | 1596494499-9852-1-git-send-email-jane.chu@oracle.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | dad42d17558f316e9e807698cd4207359b636084 |
| Headers | show |
| Series | [v2,1/3] libnvdimm/security: fix a typo | expand |
On Mon, Aug 03, 2020 at 04:41:37PM -0600, Jane Chu wrote: > 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'. > > Cc: Dan Williams <dan.j.williams@intel.com> > Fixes: d78c620a2e82 ("libnvdimm/security: Introduce a 'frozen' attribute") > Signed-off-by: Jane Chu <jane.chu@oracle.com> > Reviewed-by: Dave Jiang <dave.jiang@intel.com> Reviewed-by: Ira Weiny <ira.weiny@intel.com> > --- > drivers/nvdimm/security.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c > index 4cef69b..8f3971c 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) > -- > 1.8.3.1 >
diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c index 4cef69b..8f3971c 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)
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'. Cc: Dan Williams <dan.j.williams@intel.com> Fixes: d78c620a2e82 ("libnvdimm/security: Introduce a 'frozen' attribute") Signed-off-by: Jane Chu <jane.chu@oracle.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> --- drivers/nvdimm/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)