6.1-stable patches

added patches:
	parisc-fix-expand_stack-conversion.patch

diff --git a/queue-6.1/parisc-fix-expand_stack-conversion.patch b/queue-6.1/parisc-fix-expand_stack-conversion.patch
new file mode 100644 (file)
index 0000000..f87dcb0
--- /dev/null
+++ b/queue-6.1/parisc-fix-expand_stack-conversion.patch
@@ -0,0 +1,42 @@
+From ea3f8272876f2958463992f6736ab690fde7fa9c Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Thu, 29 Jun 2023 23:04:57 -0700
+Subject: parisc: fix expand_stack() conversion
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit ea3f8272876f2958463992f6736ab690fde7fa9c upstream.
+
+In commit 8d7071af8907 ("mm: always expand the stack with the mmap write
+lock held") I tried to deal with the remaining odd page fault handling
+cases.  The oddest one is ia64, which has stacks that grow both up and
+down.  And because ia64 was _so_ odd, I asked people to verify the end
+result.
+
+But a close second oddity is parisc, which is the only one that has a
+main stack growing up (our "CONFIG_STACK_GROWSUP" config option).  But
+it looked obvious enough that I didn't worry about it.
+
+I should have worried a bit more.  Not because it was particularly
+complex, but because I just used the wrong variable name.
+
+The previous vma isn't called "prev", it's called "prev_vma".  Blush.
+
+Fixes: 8d7071af8907 ("mm: always expand the stack with the mmap write lock held")
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/parisc/mm/fault.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/parisc/mm/fault.c
++++ b/arch/parisc/mm/fault.c
+@@ -289,7 +289,7 @@ retry:
+       mmap_read_lock(mm);
+       vma = find_vma_prev(mm, address, &prev_vma);
+       if (!vma || address < vma->vm_start) {
+-              if (!prev || !(prev->vm_flags & VM_GROWSUP))
++              if (!prev_vma || !(prev_vma->vm_flags & VM_GROWSUP))
+                       goto bad_area;
+               vma = expand_stack(mm, address);
+               if (!vma)

diff --git a/queue-6.1/series b/queue-6.1/series
index 5c4bfc7b0f95e3bf1adfe97bb30c9d500a636d9b..576064b59c61627a98442fdf7fddfe6b37c3c868 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -30,3 +30,4 @@ hid-wacom-use-ktime_t-rather-than-int-when-dealing-with-timestamps.patch
 hid-logitech-hidpp-add-hidpp_quirk_delayed_init-for-the-t651.patch
 revert-thermal-drivers-mediatek-use-devm_of_iomap-to-avoid-resource-leak-in-mtk_thermal_probe.patch
 sparc32-fix-lock_mm_and_find_vma-conversion.patch
+parisc-fix-expand_stack-conversion.patch