]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
fsverity: skip PKCS#7 parser when keyring is empty
authorEric Biggers <ebiggers@google.com>
Wed, 2 Aug 2023 04:03:53 +0000 (21:03 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Sep 2023 10:22:52 +0000 (12:22 +0200)
commit5294144b6ad27bd29217b0a6e132ffaa37a2b477
tree741bc2d590683a8de04386d032bb403f7e0c6825
parent86608e1b0c6fad141288b8f91404c62675218ea3
fsverity: skip PKCS#7 parser when keyring is empty

commit 919dc320956ea353a7fb2d84265195ad5ef525ac upstream.

If an fsverity builtin signature is given for a file but the
".fs-verity" keyring is empty, there's no real reason to run the PKCS#7
parser.  Skip this to avoid the PKCS#7 attack surface when builtin
signature support is configured into the kernel but is not being used.

This is a hardening improvement, not a fix per se, but I've added
Fixes and Cc stable to get it out to more users.

Fixes: 432434c9f8e1 ("fs-verity: support builtin file signatures")
Cc: stable@vger.kernel.org
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Link: https://lore.kernel.org/r/20230820173237.2579-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/verity/signature.c