Commit 7f58217b authored Sep 30, 2010 by Santosh Shilimkar Committed by Russell King Oct 04, 2010

ARM: 6419/1: mmu: Fix MT_MEMORY and MT_MEMORY_NONCACHED pte flags



The commit f1a2481c sets up the default flags for MT_MEMORY and
MT_MEMORY_NONCACHED memory types. L_PTE_USER flag is wrongly
set as default for these entries so remove it. Also adding
the 'L_PTE_WRITE' flag so that these pages become read-write
instead of just being read-only

[this stops them being exposed to userspace, which is the main
concern here --rmk]

Reported-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 475d92fc

arch/arm/mm/mmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ static struct mem_type mem_types[] = {
		},
		[MT_MEMORY] = {
		.prot_pte = L_PTE_PRESENT \| L_PTE_YOUNG \| L_PTE_DIRTY \|
		L_PTE_USER \| L_PTE_EXEC,
		L_PTE_WRITE \| L_PTE_EXEC,
		.prot_l1 = PMD_TYPE_TABLE,
		.prot_sect = PMD_TYPE_SECT \| PMD_SECT_AP_WRITE,
		.domain = DOMAIN_KERNEL,
		@@ -259,7 +259,7 @@ static struct mem_type mem_types[] = {
		},
		[MT_MEMORY_NONCACHED] = {
		.prot_pte = L_PTE_PRESENT \| L_PTE_YOUNG \| L_PTE_DIRTY \|
		L_PTE_USER \| L_PTE_EXEC \| L_PTE_MT_BUFFERABLE,
		L_PTE_WRITE \| L_PTE_EXEC \| L_PTE_MT_BUFFERABLE,
		.prot_l1 = PMD_TYPE_TABLE,
		.prot_sect = PMD_TYPE_SECT \| PMD_SECT_AP_WRITE,
		.domain = DOMAIN_KERNEL,

Admin message