diff options
| author | Jeremy Cline <jcline@redhat.com> | 2018-06-13 09:38:05 -0400 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2018-06-13 09:38:05 -0400 |
| commit | 6782776564b796d157b7a3322b0d8b45d1216d43 (patch) | |
| tree | 365469ca6e4a53d9f761b03cdb614d04a6c2aef5 | |
| parent | bdc446c43d2c8fd8077b5a1b78a69a81039f4b93 (diff) | |
| download | kernel-6782776564b796d157b7a3322b0d8b45d1216d43.tar.gz kernel-6782776564b796d157b7a3322b0d8b45d1216d43.tar.xz kernel-6782776564b796d157b7a3322b0d8b45d1216d43.zip | |
Fix kexec_file_load pefile signature verification (rhbz 1470995)
| -rw-r--r-- | kernel.spec | 3 | ||||
| -rw-r--r-- | kexec-bzimage-verify-pe-signature-fix.patch | 34 |
2 files changed, 37 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec index 8c246d6a8..a80c6abec 100644 --- a/kernel.spec +++ b/kernel.spec @@ -604,6 +604,9 @@ Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch # rhbz 1589855 Patch503: 0001-Revert-debugfs-inode-debugfs_create_dir-uses-mode-pe.patch +# rhbz 1470995 +Patch504: kexec-bzimage-verify-pe-signature-fix.patch + # END OF PATCH DEFINITIONS %endif diff --git a/kexec-bzimage-verify-pe-signature-fix.patch b/kexec-bzimage-verify-pe-signature-fix.patch new file mode 100644 index 000000000..6c8a51b95 --- /dev/null +++ b/kexec-bzimage-verify-pe-signature-fix.patch @@ -0,0 +1,34 @@ +From: Dave Young <dyoung@redhat.com> + +Fix kexec_file_load pefile signature verification + +Similar with Fix-for-module-sig-verification.patch, kexec_file syscall also +need pass 1UL to verify_pefile_signature so that secondary keys can be used. + +Fedora bug +https://bugzilla.redhat.com/show_bug.cgi?id=1470995 + +Latest upstream effort is below: +https://www.spinics.net/lists/kernel/msg2825184.html + +Ideally this need an upstream fix, but since nobody response we can workaround +it like the module code did. + +Signed-off-by: Dave Young <dyoung@redhat.com> +--- + arch/x86/kernel/kexec-bzimage64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-x86.orig/arch/x86/kernel/kexec-bzimage64.c ++++ linux-x86/arch/x86/kernel/kexec-bzimage64.c +@@ -533,7 +533,7 @@ static int bzImage64_cleanup(void *loade + static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len) + { + return verify_pefile_signature(kernel, kernel_len, +- NULL, ++ (void *)1UL, + VERIFYING_KEXEC_PE_SIGNATURE); + } + #endif +-- +2.17.0 |