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-01-05 16:09:49 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-05 16:09:49 -0500
commit208228cebd8a9b5af5da4e12e3d90e4a03679cf0 (patch)
tree0cf4e87e7877bff42d1f3b480c2d585347ee3eba /x86-Lock-down-IO-port-access-when-module-security-is.patch
parentbfe354a1c3609cdd83fd0647153365ff4f81701f (diff)
downloadkernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.gz
kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.tar.xz
kernel-208228cebd8a9b5af5da4e12e3d90e4a03679cf0.zip
Linux v3.19-rc2
- Temporarily disable aarch64patches - Happy New Year
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 13392c902..cf57f33bd 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 524b707894ef..c268e2581ed6 100644
+index 4c58333b4257..fc9637812d78 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -27,6 +27,7 @@
@@ -55,7 +55,7 @@ index 524b707894ef..c268e2581ed6 100644
#include <asm/uaccess.h>
-@@ -568,6 +569,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
+@@ -571,6 +572,9 @@ static ssize_t write_port(struct file *file, const char __user *buf,
unsigned long i = *ppos;
const char __user *tmp = buf;