From 144f2c697978d0fd083df96ceaa387d11c9fc7e0 Mon Sep 17 00:00:00 2001

From: Josh Boyer <jwboyer@fedoraproject.org>

Date: Fri, 20 Jun 2014 08:53:24 -0400

Subject: [PATCH] hibernate: Disable in a signed modules environment

There is currently no way to verify the resume image when returning

from hibernate.  This might compromise the signed modules trust model,

so until we can work with signed hibernate images we disable it in

a secure modules environment.

Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>

---

 kernel/power/hibernate.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c

index a9dfa79b6bab..14c7356ff53a 100644

--- a/kernel/power/hibernate.c

+++ b/kernel/power/hibernate.c

@@ -28,6 +28,7 @@

 #include <linux/syscore_ops.h>

 #include <linux/ctype.h>

 #include <linux/genhd.h>

+#include <linux/module.h>

 #include <trace/events/power.h>

 #include "power.h"

@@ -65,7 +66,7 @@ static const struct platform_hibernation_ops *hibernation_ops;

 bool hibernation_available(void)

 {

-	return (nohibernate == 0);

+	return ((nohibernate == 0) && !secure_modules());

 }

 /**

-- 

1.9.3