FAILED: patch "[PATCH] libnvdimm: prevent nvdimm from requesting key when security" failed to apply to 5.3-stable tree

PATCH [email protected] 3 participants 3 messages Oct 8, 2019 – Oct 9, 2019

Subsystems (2)

Stable branch libnvdimm: non-volatile memory device

lore

Share & tools

lore

[email protected]

author maintainer

2019-10-08 19:15 UTC #0 lore raw

The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 674f31a352da5e9f621f757b9a89262f486533a0 Mon Sep 17 00:00:00 2001
From: Dave Jiang <[email protected]>
Date: Tue, 24 Sep 2019 10:34:49 -0700
Subject: [PATCH] libnvdimm: prevent nvdimm from requesting key when security
is disabled

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

Cc [email protected]

Fixes 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs")

Signed-off-by Dave Jiang <[email protected]>

Link https://lore.kernel.org/r/156934642272.30222.5230162488753445916.stgit@djiang5-desk3.ch.intel.com open here

Signed-off-by Dan Williams <[email protected]>

drivers/nvdimm/security.c +4 -0

index 9e45b207ff01..89b85970912d 100644
@@ -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;

Sasha Levin

maintainer

2019-10-09 16:11 UTC #1 lore raw

Quoted 24 lines · On Tue, Oct 08, 2019 at 09:15:53PM +0200, [email protected] wrote:

The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 674f31a352da5e9f621f757b9a89262f486533a0 Mon Sep 17 00:00:00 2001
From: Dave Jiang <[email protected]>
Date: Tue, 24 Sep 2019 10:34:49 -0700
Subject: [PATCH] libnvdimm: prevent nvdimm from requesting key when security is disabled
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:

Quoted 8 lines

request-key[4598]: Cannot find command to construct key 661489677 request-key[4606]: Cannot find command to construct key 34713726
Cc [email protected]
Fixes 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs")
Signed-off-by Dave Jiang <[email protected]>
Link https://lore.kernel.org/r/156934642272.30222.5230162488753445916.stgit@djiang5-desk3.ch.intel.com open here
Signed-off-by Dan Williams <[email protected]>

The issue was that the way we represent security flags changed due to d78c620a2e824 ("libnvdimm/security: Introduce a 'frozen' attribute"). I fixed up 674f31a352da5 to address that and queued it for 5.3.

Dan Williams

2019-10-09 16:43 UTC #2 lore raw

Quoted 35 lines · Sasha Levin

Quoted 24 lines · On Tue, Oct 08, 2019 at 09:15:53PM +0200, [email protected] wrote:
The patch below does not apply to the 5.3-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 674f31a352da5e9f621f757b9a89262f486533a0 Mon Sep 17 00:00:00 2001
From: Dave Jiang <[email protected]>
Date: Tue, 24 Sep 2019 10:34:49 -0700
Subject: [PATCH] libnvdimm: prevent nvdimm from requesting key when security is disabled
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:
Quoted 8 lines
request-key[4598]: Cannot find command to construct key 661489677 request-key[4606]: Cannot find command to construct key 34713726
Cc [email protected]
Fixes 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs")
Signed-off-by Dave Jiang <[email protected]>
Link https://lore.kernel.org/r/156934642272.30222.5230162488753445916.stgit@djiang5-desk3.ch.intel.com open here
Signed-off-by Dan Williams <[email protected]>

Quoted 3 lines

The issue was that the way we represent security flags changed due to d78c620a2e824 ("libnvdimm/security: Introduce a 'frozen' attribute"). I fixed up 674f31a352da5 to address that and queued it for 5.3.

Thanks Sasha!