summaryrefslogtreecommitdiffstats
path: root/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-10-27 10:49:53 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-10-27 10:49:53 -0400
commitea38f2f9388111b2e0f202cae81c26629937dead (patch)
treeb6651dd350f764829e88c4d9da414ce0b895e8e4 /kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
parent793d04075c43db89f8925515999951df32179fe1 (diff)
downloadkernel-ea38f2f9388111b2e0f202cae81c26629937dead.tar.gz
kernel-ea38f2f9388111b2e0f202cae81c26629937dead.tar.xz
kernel-ea38f2f9388111b2e0f202cae81c26629937dead.zip
Refresh SB patchset to fix bisectability issue
Diffstat (limited to 'kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch')
-rw-r--r--kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
index a5832ea70..ec8675eb4 100644
--- a/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
+++ b/kexec-Disable-at-runtime-if-the-kernel-enforces-modu.patch
@@ -1,7 +1,7 @@
-From 6306cad6e5663424c08e5ebdfdcfd799c5537bfe Mon Sep 17 00:00:00 2001
+From 85968a9f0b3f05c56d4ac4002748f3412a9baab0 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <matthew.garrett@nebula.com>
Date: Fri, 9 Aug 2013 03:33:56 -0400
-Subject: [PATCH] kexec: Disable at runtime if the kernel enforces module
+Subject: [PATCH 08/20] kexec: Disable at runtime if the kernel enforces module
loading restrictions
kexec permits the loading and execution of arbitrary code in ring 0, which
@@ -14,10 +14,10 @@ Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
1 file changed, 8 insertions(+)
diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 4c5edc357923..db431971dbd4 100644
+index 980936a90ee6..fce28bf7d5d7 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
-@@ -10,6 +10,7 @@
+@@ -12,6 +12,7 @@
#include <linux/mm.h>
#include <linux/file.h>
#include <linux/kexec.h>
@@ -25,7 +25,7 @@ index 4c5edc357923..db431971dbd4 100644
#include <linux/mutex.h>
#include <linux/list.h>
#include <linux/syscalls.h>
-@@ -133,6 +134,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
+@@ -194,6 +195,13 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments,
return -EPERM;
/*
@@ -40,5 +40,5 @@ index 4c5edc357923..db431971dbd4 100644
* This leaves us room for future extensions.
*/
--
-2.4.3
+2.9.3