aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Anderson <anderson@redhat.com>2014-04-15 18:53:24 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2014-05-03 22:20:29 +0100
commitda6e4cb67c6dd1f72257c0a4a97c26dc4e80d3a7 (patch)
treed7c2a6f1483cb0010fe73991d7e1de4e90429fb2
parentd1db0eea852497762cab43b905b879dfcd3b8987 (diff)
downloadlinux-da6e4cb67c6dd1f72257c0a4a97c26dc4e80d3a7.tar.gz
arm64: Fix for the arm64 kern_addr_valid() function
Fix for the arm64 kern_addr_valid() function to recognize virtual addresses in the kernel logical memory map. The function fails as written because it does not check whether the addresses in that region are mapped at the pmd level to 2MB or 512MB pages, continues the page table walk to the pte level, and issues a garbage value to pfn_valid(). Tested on 4K-page and 64K-page kernels. Signed-off-by: Dave Anderson <anderson@redhat.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--arch/arm64/mm/mmu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 6b7e89569a3..0a472c41a67 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -374,6 +374,9 @@ int kern_addr_valid(unsigned long addr)
if (pmd_none(*pmd))
return 0;
+ if (pmd_sect(*pmd))
+ return pfn_valid(pmd_pfn(*pmd));
+
pte = pte_offset_kernel(pmd, addr);
if (pte_none(*pte))
return 0;