diff --git a/0009-arm64-use-bt-frameptr-in-arm64_unwind_frame.patch b/0009-arm64-use-bt-frameptr-in-arm64_unwind_frame.patch new file mode 100644 index 0000000000000000000000000000000000000000..bd411935e48e772da1cea6448db2fd02f388cabf --- /dev/null +++ b/0009-arm64-use-bt-frameptr-in-arm64_unwind_frame.patch @@ -0,0 +1,29 @@ +From 45685956da58b15d4542d59b95888b1968980c68 Mon Sep 17 00:00:00 2001 +From: Xiaoguang Wang +Date: Thu, 7 Nov 2024 14:40:07 +0800 +Subject: [PATCH] arm64: use bt->frameptr in arm64_unwind_frame() just like irq stack + +Fixes: 442da89f4898 ("crash: add SDEI stack resolution") +Signed-off-by: Xiaoguang Wang + +Reference: https://gitee.com/src-openeuler/crash/pulls/121 +--- + arm64.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arm64.c b/arm64.c +index b99baa3..34c3b08 100644 +--- a/arm64.c ++++ b/arm64.c +@@ -3696,7 +3696,7 @@ arm64_back_trace_cmd(struct bt_info *bt) + arm64_set_overflow_stack(bt); + bt->flags |= BT_OVERFLOW_STACK; + } +- if (arm64_in_sdei_normal_stack(bt->tc->processor, bt->bptr)) { ++ if (arm64_in_sdei_normal_stack(bt->tc->processor, bt->frameptr)) { + arm64_set_sdei_normal_stack(bt); + bt->flags |= BT_IRQSTACK; + } +-- +2.34.1 + diff --git a/crash.spec b/crash.spec index 731cb0254f769dba6c68ab98f1915ce0d608e222..25ee3272989dcd20cc614975be2f418717127ed2 100644 --- a/crash.spec +++ b/crash.spec @@ -1,6 +1,6 @@ Name: crash Version: 7.2.8 -Release: 6 +Release: 7 Summary: Linux kernel crash utility. License: GPLv3 URL: https://crash-utility.github.io @@ -16,6 +16,7 @@ Patch5: 0005-CVE-2019-1010180-DWARF-reader-Reject-sections-with-invalid-sizes.pa Patch6: 0006-arm64-fix-backtraces-of-KASAN-kernel-dumpfile-truncated.patch Patch7: 0007-arm64-Fix-again-segfault-in-arm64_is_kernel_exceptio.patch Patch8: 0008-arm64-fix-a-potential-segfault-when-unwind-frame.patch +Patch9: 0009-arm64-use-bt-frameptr-in-arm64_unwind_frame.patch BuildRequires: ncurses-devel zlib-devel lzo-devel snappy-devel BuildRequires: gcc gcc-c++ bison readline-devel @@ -81,6 +82,9 @@ install -D -m 0644 defs.h %{buildroot}%{_includedir}/%{name}/defs.h %{_mandir}/man8/crash.8* %changelog +* Fri Nov 29 2024 wangxiao - 7.2.8-7 +- arm64: use bt->frameptr in arm64_unwind_frame() just like irq stack + * Tue Nov 12 2024 wangxiao - 7.2.8-6 - arm64: fix again segfault in arm64_is_kernel_exception_frame arm64: fix a potential segfault when unwind frame