Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5463cd3 authored by Russell King's avatar Russell King
Browse files

ARM: make vectors page inaccessible from userspace 



If kuser helpers are not provided by the kernel, disable user access to
the vectors page.  With the kuser helpers gone, there is no reason for
this page to be visible to userspace.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 48be69a0

arch/arm/include/asm/page.h

+2 −0
Original line number Diff line number Diff line
@@ -142,7 +142,9 @@ extern void __cpu_copy_user_highpage(struct page *to, struct page *from, 
#define clear_page(page)	memset((void *)(page), 0, PAGE_SIZE)

extern void copy_page(void *to, const void *from);



#ifdef CONFIG_KUSER_HELPERS

#define __HAVE_ARCH_GATE_AREA 1

#endif



#ifdef CONFIG_ARM_LPAE

#include <asm/pgtable-3level-types.h>

arch/arm/kernel/process.c

+6 −1
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) 
}



#ifdef CONFIG_MMU

#ifdef CONFIG_KUSER_HELPERS

/*

 * The vectors page is always readable from user space for the

 * atomic helpers. Insert it into the gate_vma so that it is visible
@@ -458,10 +459,14 @@ int in_gate_area_no_mm(unsigned long addr) 
{

	return in_gate_area(NULL, addr);

}

#define is_gate_vma(vma)	((vma) = &gate_vma)

#else

#define is_gate_vma(vma)	0

#endif



const char *arch_vma_name(struct vm_area_struct *vma)

{

	return (vma == &gate_vma) ? "[vectors]" :

	return is_gate_vma(vma) ? "[vectors]" :

		(vma->vm_mm && vma->vm_start == vma->vm_mm->context.sigpage) ?

		 "[sigpage]" : NULL;

}

arch/arm/mm/mmu.c

+4 −0
Original line number Diff line number Diff line
@@ -1205,7 +1205,11 @@ static void __init devicemaps_init(struct machine_desc *mdesc) 
	map.pfn = __phys_to_pfn(virt_to_phys(vectors));

	map.virtual = 0xffff0000;

	map.length = PAGE_SIZE;

#ifdef CONFIG_KUSER_HELPERS

	map.type = MT_HIGH_VECTORS;

#else

	map.type = MT_LOW_VECTORS;

#endif

	create_mapping(&map);



	if (!vectors_high()) {