Commit 1335d9a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core fixes from Ingo Molnar:
 "This fixes a particularly thorny munmap() bug with MPX, plus fixes a
  host build environment assumption in objtool"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Allow AR to be overridden with HOSTAR
  x86/mpx, mm/core: Fix recursive munmap() corruption
parents 4c4a5c99 8ea58f1e

arch/powerpc/include/asm/mmu_context.h

+0 −1
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, 
extern void arch_exit_mmap(struct mm_struct *mm);



static inline void arch_unmap(struct mm_struct *mm,

			      struct vm_area_struct *vma,

			      unsigned long start, unsigned long end)

{

	if (start <= mm->context.vdso_base && mm->context.vdso_base < end)

arch/um/include/asm/mmu_context.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ static inline int arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm) 
}

extern void arch_exit_mmap(struct mm_struct *mm);

static inline void arch_unmap(struct mm_struct *mm,

			struct vm_area_struct *vma,

			unsigned long start, unsigned long end)

{

}

arch/unicore32/include/asm/mmu_context.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static inline int arch_dup_mmap(struct mm_struct *oldmm, 
}



static inline void arch_unmap(struct mm_struct *mm,

			struct vm_area_struct *vma,

			unsigned long start, unsigned long end)

{

}

arch/x86/include/asm/mmu_context.h

+3 −3
Original line number Diff line number Diff line
@@ -278,8 +278,8 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm, 
	mpx_mm_init(mm);

}



static inline void arch_unmap(struct mm_struct *mm, struct vm_area_struct *vma,

			      unsigned long start, unsigned long end)

static inline void arch_unmap(struct mm_struct *mm, unsigned long start,

			      unsigned long end)

{

	/*

	 * mpx_notify_unmap() goes and reads a rarely-hot
@@ -299,7 +299,7 @@ static inline void arch_unmap(struct mm_struct *mm, struct vm_area_struct *vma, 
	 * consistently wrong.

	 */

	if (unlikely(cpu_feature_enabled(X86_FEATURE_MPX)))

		mpx_notify_unmap(mm, vma, start, end);

		mpx_notify_unmap(mm, start, end);

}



/*

arch/x86/include/asm/mpx.h

+8 −7
Original line number Diff line number Diff line
@@ -64,12 +64,15 @@ struct mpx_fault_info { 
};



#ifdef CONFIG_X86_INTEL_MPX

int mpx_fault_info(struct mpx_fault_info *info, struct pt_regs *regs);

int mpx_handle_bd_fault(void);



extern int mpx_fault_info(struct mpx_fault_info *info, struct pt_regs *regs);

extern int mpx_handle_bd_fault(void);



static inline int kernel_managing_mpx_tables(struct mm_struct *mm)

{

	return (mm->context.bd_addr != MPX_INVALID_BOUNDS_DIR);

}



static inline void mpx_mm_init(struct mm_struct *mm)

{

	/*
@@ -78,11 +81,10 @@ static inline void mpx_mm_init(struct mm_struct *mm) 
	 */

	mm->context.bd_addr = MPX_INVALID_BOUNDS_DIR;

}

void mpx_notify_unmap(struct mm_struct *mm, struct vm_area_struct *vma,

		      unsigned long start, unsigned long end);



unsigned long mpx_unmapped_area_check(unsigned long addr, unsigned long len,

		unsigned long flags);

extern void mpx_notify_unmap(struct mm_struct *mm, unsigned long start, unsigned long end);

extern unsigned long mpx_unmapped_area_check(unsigned long addr, unsigned long len, unsigned long flags);



#else

static inline int mpx_fault_info(struct mpx_fault_info *info, struct pt_regs *regs)

{
@@ -100,7 +102,6 @@ static inline void mpx_mm_init(struct mm_struct *mm) 
{

}

static inline void mpx_notify_unmap(struct mm_struct *mm,

				    struct vm_area_struct *vma,

				    unsigned long start, unsigned long end)

{

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE