This is a note to let you know that I've just added the patch titled
csky: fix up lock_mm_and_find_vma() conversion
to the 6.1-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:
csky-fix-up-lock_mm_and_find_vma-conversion.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e55e5df193d247a38a5e1ac65a5316a0adcc22fa Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Date: Thu, 29 Jun 2023 23:34:29 -0700
Subject: csky: fix up lock_mm_and_find_vma() conversion
From: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
commit e55e5df193d247a38a5e1ac65a5316a0adcc22fa upstream.
As already mentioned in my merge message for the 'expand-stack' branch,
we have something like 24 different versions of the page fault path for
all our different architectures, all just _slightly_ different due to
various historical reasons (usually related to exactly when they
branched off the original i386 version, and the details of the other
architectures they had in their history).
And a few of them had some silly mistake in the conversion.
Most of the architectures call the faulting address 'address' in the
fault path. But not all. Some just call it 'addr'. And if you end up
doing a bit too much copy-and-paste, you end up with the wrong version
in the places that do it differently.
In this case it was csky.
Fixes: a050ba1e7422 ("mm/fault: convert remaining simple cases to lock_mm_and_find_vma()")
Reported-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/csky/mm/fault.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/csky/mm/fault.c
+++ b/arch/csky/mm/fault.c
@@ -237,7 +237,7 @@ asmlinkage void do_page_fault(struct pt_
if (is_write(regs))
flags |= FAULT_FLAG_WRITE;
retry:
- vma = lock_mm_and_find_vma(mm, address, regs);
+ vma = lock_mm_and_find_vma(mm, addr, regs);
if (unlikely(!vma)) {
bad_area_nosemaphore(regs, mm, code, addr);
return;
Patches currently in stable-queue which might be from torvalds@xxxxxxxxxxxxxxxxxxxx are
queue-6.1/mm-always-expand-the-stack-with-the-mmap-write-lock-held.patch
queue-6.1/arm-mm-convert-to-using-lock_mm_and_find_vma.patch
queue-6.1/mm-fault-convert-remaining-simple-cases-to-lock_mm_and_find_vma.patch
queue-6.1/sparc32-fix-lock_mm_and_find_vma-conversion.patch
queue-6.1/mm-make-the-page-fault-mmap-locking-killable.patch
queue-6.1/powerpc-mm-convert-to-using-lock_mm_and_find_vma.patch
queue-6.1/powerpc-mm-convert-coprocessor-fault-to-lock_mm_and_find_vma.patch
queue-6.1/arm64-mm-convert-to-using-lock_mm_and_find_vma.patch
queue-6.1/mm-introduce-new-lock_mm_and_find_vma-page-fault-helper.patch
queue-6.1/mm-make-find_extend_vma-fail-if-write-lock-not-held.patch
queue-6.1/mm-mmap-fix-error-path-in-do_vmi_align_munmap.patch
queue-6.1/riscv-mm-convert-to-using-lock_mm_and_find_vma.patch
queue-6.1/execve-expand-new-process-stack-manually-ahead-of-time.patch
queue-6.1/csky-fix-up-lock_mm_and_find_vma-conversion.patch
queue-6.1/mips-mm-convert-to-using-lock_mm_and_find_vma.patch
queue-6.1/parisc-fix-expand_stack-conversion.patch
