This is a note to let you know that I've just added the patch titled
KEYS: trusted: Fix migratable=1 failing
to the 5.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
keys-trusted-fix-migratable-1-failing.patch
and it can be found in the queue-5.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 8da7520c80468c48f981f0b81fc1be6599e3b0ad Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
Date: Fri, 29 Jan 2021 01:56:20 +0200
Subject: KEYS: trusted: Fix migratable=1 failing
From: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
commit 8da7520c80468c48f981f0b81fc1be6599e3b0ad upstream.
Consider the following transcript:
$ keyctl add trusted kmk "new 32 blobauth=helloworld keyhandle=80000000 migratable=1" @u
add_key: Invalid argument
The documentation has the following description:
migratable= 0|1 indicating permission to reseal to new PCR values,
default 1 (resealing allowed)
The consequence is that "migratable=1" should succeed. Fix this by
allowing this condition to pass instead of return -EINVAL.
[*] Documentation/security/keys/trusted-encrypted.rst
Cc: stable@xxxxxxxxxxxxxxx
Cc: "James E.J. Bottomley" <jejb@xxxxxxxxxxxxx>
Cc: Mimi Zohar <zohar@xxxxxxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Fixes: d00a1c72f7f4 ("keys: add new trusted key-type")
Signed-off-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
security/keys/trusted-keys/trusted_tpm1.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/security/keys/trusted-keys/trusted_tpm1.c
+++ b/security/keys/trusted-keys/trusted_tpm1.c
@@ -801,7 +801,7 @@ static int getoptions(char *c, struct tr
case Opt_migratable:
if (*args[0].from == '0')
pay->migratable = 0;
- else
+ else if (*args[0].from != '1')
return -EINVAL;
break;
case Opt_pcrlock:
Patches currently in stable-queue which might be from jarkko@xxxxxxxxxx are
queue-5.11/keys-trusted-fix-incorrect-handling-of-tpm_get_random.patch
queue-5.11/tpm_tis-clean-up-locality-release.patch
queue-5.11/keys-trusted-fix-migratable-1-failing.patch
queue-5.11/tpm_tis-fix-check_locality-for-correct-locality-acquisition.patch
queue-5.11/watch_queue-drop-references-to-dev-watch_queue.patch
queue-5.11/keys-trusted-reserve-tpm-for-seal-and-unseal-operations.patch
queue-5.11/x86-sgx-fix-the-return-type-of-sgx_init.patch
