summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Fix-for-module-sig-verification.patch24
-rw-r--r--kernel.spec6
2 files changed, 30 insertions, 0 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 495bb0d91..f6a272940 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -643,6 +643,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
@@ -2196,6 +2199,9 @@ 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