From: Greg Kroah-Hartman Date: Fri, 30 Jun 2023 06:51:04 +0000 (+0200) Subject: 6.3-stable patches X-Git-Tag: v6.4.1~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4ee1e4b6166eda545441401914959145e2afb1d;p=thirdparty%2Fkernel%2Fstable-queue.git 6.3-stable patches added patches: csky-fix-up-lock_mm_and_find_vma-conversion.patch --- diff --git a/queue-6.3/csky-fix-up-lock_mm_and_find_vma-conversion.patch b/queue-6.3/csky-fix-up-lock_mm_and_find_vma-conversion.patch new file mode 100644 index 00000000000..bfecde56a9d --- /dev/null +++ b/queue-6.3/csky-fix-up-lock_mm_and_find_vma-conversion.patch @@ -0,0 +1,44 @@ +From e55e5df193d247a38a5e1ac65a5316a0adcc22fa Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Thu, 29 Jun 2023 23:34:29 -0700 +Subject: csky: fix up lock_mm_and_find_vma() conversion + +From: Linus Torvalds + +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 +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + 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; diff --git a/queue-6.3/series b/queue-6.3/series index 2e8cdadf8b1..6e8265a53fc 100644 --- a/queue-6.3/series +++ b/queue-6.3/series @@ -30,3 +30,4 @@ 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 +csky-fix-up-lock_mm_and_find_vma-conversion.patch