From: Greg Kroah-Hartman Date: Fri, 30 Jun 2023 05:49:09 +0000 (+0200) Subject: fix up queue-6.3/arm64-mm-convert-to-using-lock_mm_and_find_vma.patch X-Git-Tag: v6.4.1~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f78b93be6b95ba487abbd6e70e1fccc3ffc543fb;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-6.3/arm64-mm-convert-to-using-lock_mm_and_find_vma.patch --- diff --git a/queue-6.3/arm64-mm-convert-to-using-lock_mm_and_find_vma.patch b/queue-6.3/arm64-mm-convert-to-using-lock_mm_and_find_vma.patch index 4d947455b65..cfcc84beefc 100644 --- a/queue-6.3/arm64-mm-convert-to-using-lock_mm_and_find_vma.patch +++ b/queue-6.3/arm64-mm-convert-to-using-lock_mm_and_find_vma.patch @@ -17,8 +17,8 @@ Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/arm64/Kconfig | 1 + - arch/arm64/mm/fault.c | 44 +++++++------------------------------------- - 2 files changed, 8 insertions(+), 37 deletions(-) + arch/arm64/mm/fault.c | 46 +++++++++------------------------------------- + 2 files changed, 10 insertions(+), 37 deletions(-) --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -62,7 +62,15 @@ Signed-off-by: Greg Kroah-Hartman * Check that the permissions on the VMA allow for the fault which * occurred. */ -@@ -585,31 +572,14 @@ static int __kprobes do_page_fault(unsig +@@ -535,6 +522,7 @@ static int __kprobes do_page_fault(unsig + unsigned long vm_flags; + unsigned int mm_flags = FAULT_FLAG_DEFAULT; + unsigned long addr = untagged_addr(far); ++ struct vm_area_struct *vma; + + if (kprobe_page_fault(regs, esr)) + return 0; +@@ -585,31 +573,14 @@ static int __kprobes do_page_fault(unsig perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr); @@ -99,3 +107,11 @@ Signed-off-by: Greg Kroah-Hartman /* Quick path to respond to signals */ if (fault_signal_pending(fault, regs)) { +@@ -628,6 +599,7 @@ retry: + } + mmap_read_unlock(mm); + ++done: + /* + * Handle the "normal" (no error) case first. + */