From 729325e15e72889b2db88ac15ae46694fb2381d2 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 26 Sep 2012 10:09:50 +0100
Subject: [PATCH] --- yaml --- r: 334305 b: refs/heads/master c:
 1d0059f3a468825b5fc5405c636a2f6e02707ffa h: refs/heads/master i:   334303:
 863e255b88f91e8fa5d3cb99bd3c8ac10f3abefc v: v3

---
 [refs]                | 2 +-
 trunk/kernel/module.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1319b71b94d9..04cc336741a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 106a4ee258d14818467829bf0e12aeae14c16cd7
+refs/heads/master: 1d0059f3a468825b5fc5405c636a2f6e02707ffa
diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c
index 68c564edb2c1..0e2da8695f8e 100644
--- a/trunk/kernel/module.c
+++ b/trunk/kernel/module.c
@@ -58,6 +58,7 @@
 #include <linux/jump_label.h>
 #include <linux/pfn.h>
 #include <linux/bsearch.h>
+#include <linux/fips.h>
 #include "module-internal.h"
 
 #define CREATE_TRACE_POINTS
@@ -2447,6 +2448,9 @@ static int module_sig_check(struct load_info *info,
 	}
 
 	/* Not having a signature is only an error if we're strict. */
+	if (err < 0 && fips_enabled)
+		panic("Module verification failed with error %d in FIPS mode\n",
+		      err);
 	if (err == -ENOKEY && !sig_enforce)
 		err = 0;