diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-09-03 17:26:36 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-09-03 17:28:29 -0400 |
| commit | d7ee6f3b0e2cb9569f384eeac7d1c8f5c6a93e91 (patch) | |
| tree | a623b63f6c9af5dc3fea61ca1212407a1a85af5b /sb-hibernate.patch | |
| parent | 663b7fc9c809c19db57c8bc4244db85d86b7d05b (diff) | |
| download | kernel-d7ee6f3b0e2cb9569f384eeac7d1c8f5c6a93e91.tar.gz kernel-d7ee6f3b0e2cb9569f384eeac7d1c8f5c6a93e91.tar.xz kernel-d7ee6f3b0e2cb9569f384eeac7d1c8f5c6a93e91.zip | |
Add system_keyring patches back in
Diffstat (limited to 'sb-hibernate.patch')
| -rw-r--r-- | sb-hibernate.patch | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/sb-hibernate.patch b/sb-hibernate.patch index 966024b9b..447237c60 100644 --- a/sb-hibernate.patch +++ b/sb-hibernate.patch @@ -1,4 +1,4 @@ -From 4fe6d11d21b548d6e8272cc8cad5fcc6150ef081 Mon Sep 17 00:00:00 2001 +From ffe1ee94d526900ce1e5191cdd38934477dd209a Mon Sep 17 00:00:00 2001 From: Josh Boyer <jwboyer@fedoraproject.org> Date: Fri, 26 Oct 2012 14:02:09 -0400 Subject: [PATCH] hibernate: Disable in a signed modules environment @@ -12,8 +12,8 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.com> --- kernel/power/hibernate.c | 16 +++++++++++++++- kernel/power/main.c | 7 ++++++- - kernel/power/user.c | 5 +++++ - 3 files changed, 26 insertions(+), 2 deletions(-) + kernel/power/user.c | 1 + + 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index b26f5f1..e65228b 100644 @@ -96,28 +96,17 @@ index 1d1bf63..300f300 100644 if (s != buf) /* convert the last space to a newline */ diff --git a/kernel/power/user.c b/kernel/power/user.c -index 4ed81e7..b714ee6 100644 +index 15cb72f..fa85ed5 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c -@@ -24,6 +24,8 @@ - #include <linux/console.h> +@@ -25,6 +25,7 @@ #include <linux/cpu.h> #include <linux/freezer.h> + #include <linux/module.h> +#include <linux/efi.h> -+#include <linux/module.h> #include <asm/uaccess.h> -@@ -48,6 +50,9 @@ static int snapshot_open(struct inode *inode, struct file *filp) - struct snapshot_data *data; - int error; - -+ if (secure_modules()) -+ return -EPERM; -+ - lock_system_sleep(); - - if (!atomic_add_unless(&snapshot_device_available, -1, 0)) { -- 1.8.3.1 |