summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-07-11 07:23:10 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-07-11 07:23:10 +0300
commit1df0d8960499e58963fd6c8ac75e544f2b417b29 (patch)
treeb8c47d50feba8c31b8b0e908095f28b68a23378e
parent5ab39e08ff1558ed80d93f5c5217338f19369a40 (diff)
parent813357fead4adee73f7eca6bbe0e69dfcf514dc6 (diff)
downloadlinux-1df0d8960499e58963fd6c8ac75e544f2b417b29.tar.xz
Merge tag 'libnvdimm-fix-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm fix from Dan Williams: "A one-line Fix for key ring search permissions to address a regression from -rc1" * tag 'libnvdimm-fix-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: libnvdimm/security: Fix key lookup permissions
-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 89b85970912d..4cef69bd3c1b 100644
--- a/drivers/nvdimm/security.c
+++ b/drivers/nvdimm/security.c
@@ -95,7 +95,7 @@ static struct key *nvdimm_lookup_user_key(struct nvdimm *nvdimm,
struct encrypted_key_payload *epayload;
struct device *dev = &nvdimm->dev;
- keyref = lookup_user_key(id, 0, 0);
+ keyref = lookup_user_key(id, 0, KEY_NEED_SEARCH);
if (IS_ERR(keyref))
return NULL;