]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
KEYS: trusted: Fix migratable=1 failing
authorJarkko Sakkinen <jarkko@kernel.org>
Thu, 28 Jan 2021 23:56:20 +0000 (01:56 +0200)
committerAndrea Righi <andrea.righi@canonical.com>
Mon, 15 Mar 2021 14:09:41 +0000 (15:09 +0100)
commit5b2be272dc00c24727494708089d789e5c84e652
tree2a7b681b5500867d5b01b92f6cce84c03f0f4a3a
parenta54588f39248e61fac27bc0e5a564174ab76294d
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: d00a1c72f7f4 ("keys: add new trusted key-type")
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
security/keys/trusted-keys/trusted_tpm1.c