diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-08 14:59:30 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-08 14:59:30 -0800 |
| commit | 89b19396f6c5dd09eaf8f44bcee27d42a2da1502 (patch) | |
| tree | 317c2721f3a641d3a9308c512532bfb384a4df06 /x86-Lock-down-IO-port-access-when-module-security-is.patch | |
| parent | c2e2a0849b034d919e0c2e27c36d77697579eb6b (diff) | |
| parent | b1223bfd6a6dd0bec9b3c0df7b286b22bcc35257 (diff) | |
| download | kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.gz kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.tar.xz kernel-89b19396f6c5dd09eaf8f44bcee27d42a2da1502.zip | |
Merge branch 'master' into baytrail (3.18 bump)
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.patch | 3 |
1 files changed, 1 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 7d54d9f7e..4d0b4ac02 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 @@ -1,4 +1,3 @@ -From 9fef212b0fa081b86d9e8badee77f08dbe322b5d Mon Sep 17 00:00:00 2001 From: Matthew Garrett <matthew.garrett@nebula.com> Date: Thu, 8 Mar 2012 10:35:59 -0500 Subject: [PATCH] x86: Lock down IO port access when module security is enabled @@ -45,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 917403fe10da..cdf839f9defe 100644 +index 524b707894ef..c268e2581ed6 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -27,6 +27,7 @@ |