| Message ID | 156934642272.30222.5230162488753445916.stgit@djiang5-desk3.ch.intel.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 674f31a352da5e9f621f757b9a89262f486533a0 |
| Headers | show |
| Series | [v2] libnvdimm: prevent nvdimm from requesting key when security is disabled | expand |
On Tue, Sep 24, 2019 at 10:35 AM Dave Jiang <dave.jiang@intel.com> wrote: > > Current implementation attempts to request keys from the keyring even when > security is not enabled. Change behavior so when security is disabled it > will skip key request. > > Error messages seen when no keys are installed and libnvdimm is loaded: > > request-key[4598]: Cannot find command to construct key 661489677 > request-key[4606]: Cannot find command to construct key 34713726 > ... > > Fixes: 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs") > > Cc: stable@vger.kernel.org > Signed-off-by: Dave Jiang <dave.jiang@intel.com> > --- > > v2: > - Fix up commit header to add more information and cc stable. (Dan) Looks, good, applied.
diff --git a/drivers/nvdimm/security.c b/drivers/nvdimm/security.c index 9e45b207ff01..89b85970912d 100644 --- a/drivers/nvdimm/security.c +++ b/drivers/nvdimm/security.c @@ -177,6 +177,10 @@ static int __nvdimm_security_unlock(struct nvdimm *nvdimm) || !nvdimm->sec.flags) return -EIO; + /* No need to go further if security is disabled */ + if (test_bit(NVDIMM_SECURITY_DISABLED, &nvdimm->sec.flags)) + return 0; + if (test_bit(NDD_SECURITY_OVERWRITE, &nvdimm->flags)) { dev_dbg(dev, "Security operation in progress.\n"); return -EBUSY;
Current implementation attempts to request keys from the keyring even when security is not enabled. Change behavior so when security is disabled it will skip key request. Error messages seen when no keys are installed and libnvdimm is loaded: request-key[4598]: Cannot find command to construct key 661489677 request-key[4606]: Cannot find command to construct key 34713726 ... Fixes: 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs") Cc: stable@vger.kernel.org Signed-off-by: Dave Jiang <dave.jiang@intel.com> --- v2: - Fix up commit header to add more information and cc stable. (Dan) drivers/nvdimm/security.c | 4 ++++ 1 file changed, 4 insertions(+)