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

Commit fff00db8 authored by Kees Cook's avatar Kees Cook Committed by Russell King
Browse files

ARM: 8014/1: mm: fix reporting of read-only PMD bits 



On non-LPAE ARMv6+, read-only PMD bits are defined with the combination
"PMD_SECT_APX | PMD_SECT_AP_WRITE". Adjusted the bit masks to correctly
report this.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarLaura Abbott <lauraa@codeaurora.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8fad87bc

arch/arm/mm/dump.c

+32 −15
Original line number Diff line number Diff line
@@ -120,7 +120,34 @@ static const struct prot_bits pte_bits[] = { 
};



static const struct prot_bits section_bits[] = {

#ifndef CONFIG_ARM_LPAE

#ifdef CONFIG_ARM_LPAE

	{

		.mask	= PMD_SECT_USER,

		.val	= PMD_SECT_USER,

		.set	= "USR",

	}, {

		.mask	= PMD_SECT_RDONLY,

		.val	= PMD_SECT_RDONLY,

		.set	= "ro",

		.clear	= "RW",

#elif __LINUX_ARM_ARCH__ >= 6

	{

		.mask	= PMD_SECT_APX | PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,

		.val	= PMD_SECT_APX | PMD_SECT_AP_WRITE,

		.set	= "    ro",

	}, {

		.mask	= PMD_SECT_APX | PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,

		.val	= PMD_SECT_AP_WRITE,

		.set	= "    RW",

	}, {

		.mask	= PMD_SECT_APX | PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,

		.val	= PMD_SECT_AP_READ,

		.set	= "USR ro",

	}, {

		.mask	= PMD_SECT_APX | PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,

		.val	= PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,

		.set	= "USR RW",

#else /* ARMv4/ARMv5  */

	/* These are approximate */

	{

		.mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,
@@ -138,16 +165,6 @@ static const struct prot_bits section_bits[] = { 
		.mask   = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,

		.val    = PMD_SECT_AP_READ | PMD_SECT_AP_WRITE,

		.set    = "USR RW",

#else

	{

		.mask	= PMD_SECT_USER,

		.val	= PMD_SECT_USER,

		.set	= "USR",

	}, {

		.mask	= PMD_SECT_RDONLY,

		.val	= PMD_SECT_RDONLY,

		.set	= "ro",

		.clear	= "RW",

#endif

	}, {

		.mask	= PMD_SECT_XN,