summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/uboot.c
diff options
context:
space:
mode:
authorYannik Sembritzki <yannik@sembritzki.me>2018-08-16 14:05:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-09 20:01:23 +0200
commit7c439bc2220d624fc7edba4c9bdc1d65b4f47f26 (patch)
tree4cdbb04677b59d2387be43f2aff942d163a3c374 /arch/m68k/kernel/uboot.c
parent40b08cdac9ae0877dd39d2dcfe2f8c7c68c8ce59 (diff)
downloadlinux-stable-7c439bc2220d624fc7edba4c9bdc1d65b4f47f26.tar.gz
linux-stable-7c439bc2220d624fc7edba4c9bdc1d65b4f47f26.tar.bz2
linux-stable-7c439bc2220d624fc7edba4c9bdc1d65b4f47f26.zip
Fix kexec forbidding kernels signed with keys in the secondary keyring to boot
commit ea93102f32244e3f45c8b26260be77ed0cc1d16c upstream. 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@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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k/kernel/uboot.c')
0 files changed, 0 insertions, 0 deletions