summaryrefslogtreecommitdiffstats
path: root/x86-Lock-down-IO-port-access-when-module-security-is.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-02-16 10:01:09 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-16 10:01:09 -0500
commitf1193f2c7556c2f1a74c3b6f16320a6d899806d9 (patch)
tree6a6107b0e900f3eb78cf61ba8ceeda44a6307ba3 /x86-Lock-down-IO-port-access-when-module-security-is.patch
parent87b2a17d8cd45e1bb04d49c89ae7af476bcd917c (diff)
downloadkernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.tar.gz
kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.tar.xz
kernel-f1193f2c7556c2f1a74c3b6f16320a6d899806d9.zip
Linux v3.19-6676-g1fa185ebcbce
Diffstat (limited to 'x86-Lock-down-IO-port-access-when-module-security-is.patch')
-rw-r--r--x86-Lock-down-IO-port-access-when-module-security-is.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/x86-Lock-down-IO-port-access-when-module-security-is.patch b/x86-Lock-down-IO-port-access-when-module-security-is.patch
index 52cb956dc..0c6498190 100644
--- a/x86-Lock-down-IO-port-access-when-module-security-is.patch
+++ b/x86-Lock-down-IO-port-access-when-module-security-is.patch
@@ -44,7 +44,7 @@ index 4ddaf66ea35f..00b440307419 100644
}
regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 9a6b63783a94..bd117a1019f7 100644
+index 297110c12635..efe38c1bc234 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -27,6 +27,7 @@
@@ -53,9 +53,9 @@ index 9a6b63783a94..bd117a1019f7 100644
#include <linux/aio.h>
+#include <linux/module.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
-@@ -582,6 +583,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
+@@ -577,6 +578,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
unsigned long i = *ppos;
const char __user *tmp = buf;