linux-kernel - [PATCH 2/2] Fix kexec forbidding kernels signed with keys in the secondary keyring to boot

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <153442472298.17751.5395559214488109936.stgit@warthog.procyon.org.uk>
Date:   Thu, 16 Aug 2018 14:05:23 +0100
From:   David Howells <dhowells@...hat.com>
To:     yannik@...britzki.me, torvalds@...ux-foundation.org
Cc:     kexec@...ts.infradead.org, keyrings@...r.kernel.org,
        linux-security-module@...r.kernel.org, stable@...r.kernel.org,
        dhowells@...hat.com, linux-kernel@...r.kernel.org,
        dyoung@...hat.com, James.Bottomley@...senPartnership.com,
        gregkh@...uxfoundation.org
Subject: [PATCH 2/2] Fix kexec forbidding kernels signed with keys in the
 secondary keyring to boot

From: Yannik Sembritzki <yannik@...britzki.me>

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: d3bfe84129f6 ("certs: Add a secondary system keyring that can be added to dynamically")
Signed-off-by: Yannik Sembritzki <yannik@...britzki.me>
Signed-off-by: David Howells <dhowells@...hat.com>
cc: kexec@...ts.infradead.org
cc: keyrings@...r.kernel.org
cc: linux-security-module@...r.kernel.org
cc: stable@...r.kernel.org
---

 arch/x86/kernel/kexec-bzimage64.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index 7326078eaa7a..278cd07228dd 100644
--- 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