summaryrefslogtreecommitdiff
path: root/arch/arm/mm/dump.c
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2014-02-14 20:19:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-02-18 19:41:26 +0000
commitcd91b2fecfa66967e6ad732a9af860eb96c31ba4 (patch)
tree05bc0e7b0c2364128489e32006d7a1ef0805379a /arch/arm/mm/dump.c
parent39544ac9df20f73e49fc6b9ac19ff533388c82c0 (diff)
ARM: 7963/1: mm: report both sections from PMD
On 2-level page table systems, the PMD has 2 section entries. Report these, otherwise ARM_PTDUMP will miss reporting permission changes on odd section boundaries. Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Tested-by: Steve Capper <steve.capper@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/dump.c')
-rw-r--r--arch/arm/mm/dump.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/dump.c b/arch/arm/mm/dump.c
index 2b3a56414271..ef69152f9b52 100644
--- a/arch/arm/mm/dump.c
+++ b/arch/arm/mm/dump.c
@@ -264,6 +264,9 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start)
note_page(st, addr, 3, pmd_val(*pmd));
else
walk_pte(st, pmd, addr);
+
+ if (SECTION_SIZE < PMD_SIZE && pmd_large(pmd[1]))
+ note_page(st, addr + SECTION_SIZE, 3, pmd_val(pmd[1]));
}
}