Commit 643a6632 authored Jan 29, 2021 by Jarkko Sakkinen Committed by Greg Kroah-Hartman Mar 04, 2021

KEYS: trusted: Fix migratable=1 failing



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@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: d00a1c72 ("keys: add new trusted key-type")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1167ca53

security/keys/trusted.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -796,7 +796,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: