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-13 11:00:04 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-02-13 11:00:04 -0500
commit87b2a17d8cd45e1bb04d49c89ae7af476bcd917c (patch)
tree24ce81def04974ec7f60322ad2528aebdc84e5b1 /x86-Lock-down-IO-port-access-when-module-security-is.patch
parentfe6305dc490a4abd630b3bbe6a9b1e8cb6e37bb8 (diff)
downloadkernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.tar.gz
kernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.tar.xz
kernel-87b2a17d8cd45e1bb04d49c89ae7af476bcd917c.zip
Linux v3.19-5015-gc7d7b9867155
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.patch4
1 files changed, 2 insertions, 2 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 cf57f33bd..52cb956dc 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 4c58333b4257..fc9637812d78 100644
+index 9a6b63783a94..bd117a1019f7 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -27,6 +27,7 @@
@@ -55,7 +55,7 @@ index 4c58333b4257..fc9637812d78 100644
#include <asm/uaccess.h>
-@@ -571,6 +572,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
+@@ -582,6 +583,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
unsigned long i = *ppos;
const char __user *tmp = buf;