diff options
-rw-r--r-- | Fix-for-module-sig-verification.patch | 24 | ||||
-rw-r--r-- | kernel.spec | 18 | ||||
-rw-r--r-- | sources | 3 |
3 files changed, 40 insertions, 5 deletions
diff --git a/Fix-for-module-sig-verification.patch b/Fix-for-module-sig-verification.patch new file mode 100644 index 000000000..3a5de65eb --- /dev/null +++ b/Fix-for-module-sig-verification.patch @@ -0,0 +1,24 @@ +From ea6e7d9d0fe3e448aef19b3943d4897ae0bef128 Mon Sep 17 00:00:00 2001 +From: Fedora Kernel Team <kernel-team@fedoraproject.org> +Date: Thu, 3 Aug 2017 13:46:51 -0500 +Subject: [PATCH] Fix for module sig verification + +--- + kernel/module_signing.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel/module_signing.c b/kernel/module_signing.c +index 937c844..d3d6f95 100644 +--- a/kernel/module_signing.c ++++ b/kernel/module_signing.c +@@ -81,6 +81,6 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen) + } + + return verify_pkcs7_signature(mod, modlen, mod + modlen, sig_len, +- NULL, VERIFYING_MODULE_SIGNATURE, ++ (void *)1UL, VERIFYING_MODULE_SIGNATURE, + NULL, NULL); + } +-- +2.13.3 + diff --git a/kernel.spec b/kernel.spec index d45dc5f50..a348a9225 100644 --- a/kernel.spec +++ b/kernel.spec @@ -75,9 +75,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 4 +%global rcrev 5 # The git snapshot level -%define gitrev 4 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -660,6 +660,9 @@ Patch615: 0015-i2c-cht-wc-Add-Intel-Cherry-Trail-Whiskey-Cove-SMBUS.patch # Small workaround patches for issues with a more comprehensive fix in -next Patch616: 0016-Input-silead-Do-not-try-to-directly-access-the-GPIO-.patch +# rhbz 1476467 +Patch617: Fix-for-module-sig-verification.patch + # END OF PATCH DEFINITIONS %endif @@ -2216,6 +2219,15 @@ fi # # %changelog +* Mon Aug 14 2017 Justin M. Forbes <jforbes@fedoraproject.org> +- Fix for signed module loading (rhbz 1476467) + +* Mon Aug 14 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc5.git0.1 +- Linux v4.13-rc5 + +* Mon Aug 14 2017 Laura Abbott <labbott@fedoraproject.org> +- Disable debugging options. + * Fri Aug 11 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc4.git4.1 - Linux v4.13-rc4-220-gb2dbdf2ca1d2 @@ -1,4 +1,3 @@ SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 -SHA512 (patch-4.13-rc4.xz) = 0f03c25f705892ffcff410b3d3068fe25a876c91ec251497ceda37bfdef1c88bf0ed5486c5e68f399db1f5a11e9a08c48d894cc80cb8e9b3a56ce02f203cc1bc -SHA512 (patch-4.13-rc4-git4.xz) = e6ff994f9a9d197ddfb027a720651919dc96703db29060ee66189177dc0a99cc09a5b403250115f3f60dc70406fb53aafe6f0d2f3f5ff015b0bce84d92f70267 +SHA512 (patch-4.13-rc5.xz) = eebba5b56aa93aaea8ff450febbd13bb5ffef9a8331666dc6ac44a73b355e8ec36d9d27da1aaec07e45844669bd31e9d8fadd278aa6d04356af2aa90387d65ac |