summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/mpx.c
diff options
context:
space:
mode:
authorDave Hansen <dave.hansen@linux.intel.com>2015-06-07 11:37:02 -0700
committerIngo Molnar <mingo@kernel.org>2015-06-09 12:24:31 +0200
commiteb099e5bc5457c42043e57cf0f4ce574669b9697 (patch)
treee969f2269bd83ec3374daee2da146b0af1814d81 /arch/x86/mm/mpx.c
parent3c1d32300920a446c67d697cd6b80f012ad06028 (diff)
downloadlinux-eb099e5bc5457c42043e57cf0f4ce574669b9697.tar.bz2
x86/mpx: Restrict the mmap() size check to bounds tables
The comment and code here are confusing. We do not currently allocate the bounds directory in the kernel. Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Dave Hansen <dave@sr71.net> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20150607183702.222CEC2A@viggo.jf.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/mm/mpx.c')
-rw-r--r--arch/x86/mm/mpx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index 47e4a8564012..d6e02f3adee0 100644
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
@@ -46,8 +46,8 @@ static unsigned long mpx_mmap(unsigned long len)
vm_flags_t vm_flags;
struct vm_area_struct *vma;
- /* Only bounds table and bounds directory can be allocated here */
- if (len != MPX_BD_SIZE_BYTES && len != MPX_BT_SIZE_BYTES)
+ /* Only bounds table can be allocated here */
+ if (len != MPX_BT_SIZE_BYTES)
return -EINVAL;
down_write(&mm->mmap_sem);