Fix kexec forbidding kernels signed with keys in the secondary keyring to boot

Yannik · torvalds · commit ea93102f3224 · 2018-08-16T09:57:20.000-07:00
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 <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>
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
@@ -532,7 +532,7 @@ static int bzImage64_cleanup(void *loader_data)
 static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len)
 {
 	return verify_pefile_signature(kernel, kernel_len,
-				       NULL,
+				       VERIFY_USE_SECONDARY_KEYRING,
 				       VERIFYING_KEXEC_PE_SIGNATURE);
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ static int bzImage64_cleanup(void *loader_data)`
`532`	`532`	`static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len)`
`533`	`533`	`{`
`534`	`534`	`return verify_pefile_signature(kernel, kernel_len,`
`535`		`- NULL,`
	`535`	`+ VERIFY_USE_SECONDARY_KEYRING,`
`536`	`536`	`VERIFYING_KEXEC_PE_SIGNATURE);`
`537`	`537`	`}`
`538`	`538`	`#endif`