Skip to content

Commit ea93102

Browse files
Yanniktorvalds
authored andcommitted
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: d3bfe84 ("certs: Add a secondary system keyring that can be added to dynamically") Signed-off-by: Yannik Sembritzki <[email protected]> Signed-off-by: David Howells <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 817aef2 commit ea93102

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/kexec-bzimage64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ static int bzImage64_cleanup(void *loader_data)
532532
static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len)
533533
{
534534
return verify_pefile_signature(kernel, kernel_len,
535-
NULL,
535+
VERIFY_USE_SECONDARY_KEYRING,
536536
VERIFYING_KEXEC_PE_SIGNATURE);
537537
}
538538
#endif

0 commit comments

Comments
 (0)