]> git.baikalelectronics.ru Git - kernel.git/commit
Fix kexec forbidding kernels signed with keys in the secondary keyring to boot
authorYannik Sembritzki <yannik@sembritzki.me>
Thu, 16 Aug 2018 13:05:23 +0000 (14:05 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Aug 2018 16:57:20 +0000 (09:57 -0700)
commite2128f35c5b7dc8cc285303c78909860f1b8ee06
tree75ccf6885543ec7b84a142ce8e209c0f62ff7fd6
parent37c0cecbee89a7194f673122d058d00707ee56db
Fix kexec forbidding kernels signed with keys in the secondary keyring to boot

The split of .system_keyring into .builtin_trusted_keys and
.secondary_trusted_keys broke kexec, thereby preventing kernels signed by
keys which are now in the secondary keyring from being kexec'd.

Fix this by passing VERIFY_USE_SECONDARY_KEYRING to
verify_pefile_signature().

Fixes: d6efe69a1f82 ("certs: Add a secondary system keyring that can be added to dynamically")
Signed-off-by: Yannik Sembritzki <yannik@sembritzki.me>
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: kexec@lists.infradead.org
Cc: keyrings@vger.kernel.org
Cc: linux-security-module@vger.kernel.org
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/kexec-bzimage64.c