x86/mm: Fix kernel oops in PTDUMP code with HIGHPTE=y
PATCH 1/1 x86/mm: Fix kernel oops in PTDUMP code with HIGHPTE=y
From: Joerg Roedel <[email protected]>
The walk_pte_level() function just uses __va to get the virtual address of the PTE page, but that breaks when the PTE page is not in the direct mapping with HIGHPTE=y.
The result is an unhandled kernel paging request at some random address when accessing the current_kernel or current_user file.
Use the correct API to access PTE pages nd fix the oops.
--- arch/x86/mm/dump_pagetables.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/mm/dump_pagetables.c +6 -5
@@ -18,6 +18,7 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/seq_file.h> +#include <linux/highmem.h> #include <asm/pgtable.h>
@@ -344,16 +345,16 @@ static void walk_pte_level(struct seq_file *m, struct pg_state *st, pmd_t addr, pgprotval_t eff_in, unsigned long P) { int i; -pte_t *start; +pte_t *pte;pgprotval_t prot, eff; - start = (pte_t *)pmd_page_vaddr (addr);for (i =0 ; i <PTRS_PER_PTE ; i++) { - prot =pte_flags (*start); - eff =effective_prot (eff_in, prot); st->current_address =normalize_addr (P + i *PTE_LEVEL_MULT ); + pte =pte_offset_map (&addr, st->current_address); + prot =pte_flags (*pte); + eff =effective_prot (eff_in, prot);note_page (m, st,__pgprot (prot), eff,5 ); - start++; +pte_unmap (pte); } }#ifdef CONFIG_KASAN
Signature · 1 line
2.13.6
tip-bot for Joerg Roedel
merge bot[tip:x86/urgent] x86/mm: Prevent kernel Oops in PTDUMP code with HIGHPTE=y
x86/mm: Prevent kernel Oops in PTDUMP code with HIGHPTE=y
Commit-ID: d6ef1f194b7569af8b8397876dc9ab07649d63cb Gitweb: https://git.kernel.org/tip/d6ef1f194b7569af8b8397876dc9ab07649d63cb Author: Joerg Roedel <[email protected]> AuthorDate: Tue, 17 Apr 2018 15:27:16 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 17 Apr 2018 15:43:01 +0200
x86/mm: Prevent kernel Oops in PTDUMP code with HIGHPTE=y
The walk_pte_level() function just uses __va to get the virtual address of the PTE page, but that breaks when the PTE page is not in the direct mapping with HIGHPTE=y.
The result is an unhandled kernel paging request at some random address when accessing the current_kernel or current_user file.
Use the correct API to access PTE pages.
--- arch/x86/mm/dump_pagetables.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/mm/dump_pagetables.c +6 -5
@@ -18,6 +18,7 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/seq_file.h> +#include <linux/highmem.h> #include <asm/pgtable.h>
@@ -334,16 +335,16 @@ static void walk_pte_level(struct seq_file *m, struct pg_state *st, pmd_t addr, pgprotval_t eff_in, unsigned long P) { int i; -pte_t *start; +pte_t *pte;pgprotval_t prot, eff; - start = (pte_t *)pmd_page_vaddr (addr);for (i =0 ; i <PTRS_PER_PTE ; i++) { - prot =pte_flags (*start); - eff =effective_prot (eff_in, prot); st->current_address =normalize_addr (P + i *PTE_LEVEL_MULT ); + pte =pte_offset_map (&addr, st->current_address); + prot =pte_flags (*pte); + eff =effective_prot (eff_in, prot);note_page (m, st,__pgprot (prot), eff,5 ); - start++; +pte_unmap (pte); } }#ifdef CONFIG_KASAN