Commit a8965276 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Ingo Molnar
Browse files

x86/mpx: Do not set ->vm_ops on MPX VMAs 



MPX setups private anonymous mapping, but uses vma->vm_ops too.
This can confuse core VM, as it relies on vm->vm_ops to
distinguish file VMAs from anonymous.

As result we will get SIGBUS, because handle_pte_fault() thinks
it's file VMA without vm_ops->fault and it doesn't know how to
handle the situation properly.

Let's fix that by not setting ->vm_ops.

We don't really need ->vm_ops here: MPX VMA can be detected with
VM_MPX flag. And vma_merge() will not merge MPX VMA with non-MPX
VMA, because ->vm_flags won't match.

The only thing left is name of VMA. I'm not sure if it's part of
ABI, or we can just drop it. The patch keep it by providing
arch_vma_name() on x86.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Cc: <stable@vger.kernel.org> # Fixes: 6b7339f4 (mm: avoid setting up anonymous pages into file mapping)
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dave@sr71.net
Link: http://lkml.kernel.org/r/20150720212958.305CC3E9@viggo.jf.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bbc03778

arch/x86/mm/mmap.c

+7 −0
Original line number Diff line number Diff line
@@ -126,3 +126,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm) 
		mm->get_unmapped_area = arch_get_unmapped_area_topdown;

	}

}



const char *arch_vma_name(struct vm_area_struct *vma)

{

	if (vma->vm_flags & VM_MPX)

		return "[mpx]";

	return NULL;

}

arch/x86/mm/mpx.c

+3 −21
Original line number Diff line number Diff line
@@ -20,20 +20,6 @@ 
#define CREATE_TRACE_POINTS

#include <asm/trace/mpx.h>



static const char *mpx_mapping_name(struct vm_area_struct *vma)

{

	return "[mpx]";

}



static struct vm_operations_struct mpx_vma_ops = {

	.name = mpx_mapping_name,

};



static int is_mpx_vma(struct vm_area_struct *vma)

{

	return (vma->vm_ops == &mpx_vma_ops);

}



static inline unsigned long mpx_bd_size_bytes(struct mm_struct *mm)

{

	if (is_64bit_mm(mm))
@@ -53,9 +39,6 @@ static inline unsigned long mpx_bt_size_bytes(struct mm_struct *mm) 
/*

 * This is really a simplified "vm_mmap". it only handles MPX

 * bounds tables (the bounds directory is user-allocated).

 *

 * Later on, we use the vma->vm_ops to uniquely identify these

 * VMAs.

 */

static unsigned long mpx_mmap(unsigned long len)

{
@@ -101,7 +84,6 @@ static unsigned long mpx_mmap(unsigned long len) 
		ret = -ENOMEM;

		goto out;

	}

	vma->vm_ops = &mpx_vma_ops;



	if (vm_flags & VM_LOCKED) {

		up_write(&mm->mmap_sem);
@@ -812,7 +794,7 @@ static noinline int zap_bt_entries_mapping(struct mm_struct *mm, 
		 * so stop immediately and return an error.  This

		 * probably results in a SIGSEGV.

		 */

		if (!is_mpx_vma(vma))

		if (!(vma->vm_flags & VM_MPX))

			return -EINVAL;



		len = min(vma->vm_end, end) - addr;
@@ -945,9 +927,9 @@ static int try_unmap_single_bt(struct mm_struct *mm, 
	 * lots of tables even though we have no actual table

	 * entries in use.

	 */

	while (next && is_mpx_vma(next))

	while (next && (next->vm_flags & VM_MPX))

		next = next->vm_next;

	while (prev && is_mpx_vma(prev))

	while (prev && (prev->vm_flags & VM_MPX))

		prev = prev->vm_prev;

	/*

	 * We know 'start' and 'end' lie within an area controlled

CRA Git | Maintained and supported by SUSTech CRA and CCSE