diff mbox series

[v5,2/3] KEYS: trusted: Fix migratable=1 failing

Message ID 20210128235621.127925-3-jarkko@kernel.org
State Accepted
Commit 8da7520c80468c48f981f0b81fc1be6599e3b0ad
Headers show
Series [v5,1/3] KEYS: trusted: Fix incorrect handling of tpm_get_random() | expand

Commit Message

Jarkko Sakkinen Jan. 28, 2021, 11:56 p.m. UTC 
From: Jarkko Sakkinen <jarkko@kernel.org>

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@vger.kernel.org
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: Mimi Zohar <zohar@linux.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Fixes: d00a1c72f7f4 ("keys: add new trusted key-type")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
---
 security/keys/trusted-keys/trusted_tpm1.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mimi Zohar Jan. 31, 2021, 12:44 p.m. UTC | #1 
On Fri, 2021-01-29 at 01:56 +0200, jarkko@kernel.org wrote:
> From: Jarkko Sakkinen <jarkko@kernel.org>

> 

> 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@vger.kernel.org

> Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>

> Cc: Mimi Zohar <zohar@linux.ibm.com>

> Cc: David Howells <dhowells@redhat.com>

> Fixes: d00a1c72f7f4 ("keys: add new trusted key-type")

> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>


thanks,

Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
diff mbox series

Patch

diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c
index 204826b734ac..493eb91ed017 100644
--- 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 trusted_key_payload *pay,
 		case Opt_migratable:
 			if (*args[0].from == '0')
 				pay->migratable = 0;
-			else
+			else if (*args[0].from != '1')
 				return -EINVAL;
 			break;
 		case Opt_pcrlock: