This is a note to let you know that I've just added the patch titled
parisc: Fix set_fixmap() on PA1.x CPUs
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
parisc-fix-set_fixmap-on-pa1.x-cpus.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6e866a462867b60841202e900f10936a0478608c Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@xxxxxx>
Date: Sun, 31 Oct 2021 21:58:12 +0100
Subject: parisc: Fix set_fixmap() on PA1.x CPUs
From: Helge Deller <deller@xxxxxx>
commit 6e866a462867b60841202e900f10936a0478608c upstream.
Fix a kernel crash which happens on PA1.x CPUs while initializing the
FTRACE/KPROBE breakpoints. The PTE table entries for the fixmap area
were not created correctly.
Signed-off-by: Helge Deller <deller@xxxxxx>
Fixes: ccfbc68d41c2 ("parisc: add set_fixmap()/clear_fixmap()")
Cc: stable@xxxxxxxxxxxxxxx # v5.2+
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/parisc/mm/fixmap.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/arch/parisc/mm/fixmap.c
+++ b/arch/parisc/mm/fixmap.c
@@ -18,12 +18,9 @@ void notrace set_fixmap(enum fixed_addre
pte_t *pte;
if (pmd_none(*pmd))
- pmd = pmd_alloc(NULL, pgd, vaddr);
-
- pte = pte_offset_kernel(pmd, vaddr);
- if (pte_none(*pte))
pte = pte_alloc_kernel(pmd, vaddr);
+ pte = pte_offset_kernel(pmd, vaddr);
set_pte_at(&init_mm, vaddr, pte, __mk_pte(phys, PAGE_KERNEL_RWX));
flush_tlb_kernel_range(vaddr, vaddr + PAGE_SIZE);
}
Patches currently in stable-queue which might be from deller@xxxxxx are
queue-5.4/parisc-fix-ptrace-check-on-syscall-return.patch
queue-5.4/task_stack-fix-end_of_stack-for-architectures-with-u.patch
queue-5.4/parisc-kgdb-add-kgdb_roundup-to-make-kgdb-work-with-.patch
queue-5.4/parisc-fix-set_fixmap-on-pa1.x-cpus.patch
queue-5.4/parisc-fix-warning-in-flush_tlb_all.patch
queue-5.4/parisc-fix-backtrace-to-always-include-init-funtion-names.patch
queue-5.4/parisc-unwind-fix-unwinder-when-config_64bit-is-enab.patch
