!33 [sync] PR-32: fix patch issue in upgrade version commit

From: @openeuler-sync-bot
Reviewed-by: @xiezhipeng1,@openeuler-basic
Signed-off-by: @xiezhipeng1

0004-arm64-fix-a-potential-segfault-when-unwind-frame.patch

@@ -1,72 +0,0 @@
-From af895b219876b293d551e6dec825aba3905c0588 Mon Sep 17 00:00:00 2001
-From: "qiwu.chen" <qiwu.chen@transsion.com>
-Date: Wed, 24 Jul 2024 01:36:09 +0000
-Subject: [PATCH] arm64: fix a potential segfault when unwind frame
-
-The range of frame->fp is checked insufficiently, which may lead to a wrong
-next fp. As a result, bt->stackbuf will be accessed out of range, and segfault.
-
-  crash> bt
-  [Detaching after fork from child process 11409]
-  PID: 7661     TASK: ffffff81858aa500  CPU: 4    COMMAND: "sh"
-   #0 [ffffffc008003f50] local_cpu_stop at ffffffdd7669444c
-
-  Thread 1 "crash" received signal SIGSEGV, Segmentation fault.
-  0x00005555558266cc in arm64_unwind_frame (bt=0x7fffffffd8f0, frame=0x7fffffffd080) at
-  arm64.c:2821
-  2821            frame->fp = GET_STACK_ULONG(fp);
-  (gdb) bt
-  arm64.c:2821
-  out>) at main.c:1338
-  gdb_interface.c:81
-  (gdb) p /x *(struct bt_info*) 0x7fffffffd8f0
-  $3 = {task = 0xffffff81858aa500, flags = 0x0, instptr = 0xffffffdd76694450, stkptr =
-  0xffffffc008003f40, bptr = 0x0, stackbase = 0xffffffc027288000,
-    stacktop = 0xffffffc02728c000, stackbuf = 0x555556115a40, tc = 0x55559d16fdc0, hp = 0x0,
-  textlist = 0x0, ref = 0x0, frameptr = 0xffffffc008003f50,
-    call_target = 0x0, machdep = 0x0, debug = 0x0, eframe_ip = 0x0, radix = 0x0, cpumask =
-  0x0}
-  (gdb) p /x *(struct arm64_stackframe*) 0x7fffffffd080
-  $4 = {fp = 0xffffffc008003f50, sp = 0xffffffc008003f60, pc = 0xffffffdd76694450}
-  crash> bt -S 0xffffffc008003f50
-  PID: 7661     TASK: ffffff81858aa500  CPU: 4    COMMAND: "sh"
-  bt: non-process stack address for this task: ffffffc008003f50
-      (valid range: ffffffc027288000 - ffffffc02728c000)
-
-Check frame->fp value sufficiently before access it. Only frame->fp within
-the range of bt->stackbase and bt->stacktop will be regarded as valid.
-
-Signed-off-by: qiwu.chen <qiwu.chen@transsion.com>
-
-Conflict: NA
-Reference: https://github.com/crash-utility/crash/commit/af895b219876b293d551e6dec825aba3905c0588
-
----
- arm64.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arm64.c b/arm64.c
-index b3040d7..624dba2 100644
---- a/arm64.c
-+++ b/arm64.c
-@@ -2814,7 +2814,7 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
- 	low  = frame->sp;
- 	high = (low + stack_mask) & ~(stack_mask);
- 
--	if (fp < low || fp > high || fp & 0xf)
-+	if (fp < low || fp > high || fp & 0xf || !INSTACK(fp, bt))
- 		return FALSE;
- 
- 	frame->sp = fp + 0x10;
-@@ -3024,7 +3024,7 @@ arm64_unwind_frame_v2(struct bt_info *bt, struct arm64_stackframe *frame,
- 	low  = frame->sp;
- 	high = (low + stack_mask) & ~(stack_mask);
- 
--	if (fp < low || fp > high || fp & 0xf)
-+	if (fp < low || fp > high || fp & 0xf || !INSTACK(fp, bt))
- 		return FALSE;
- 
- 	if (CRASHDEBUG(1))
--- 
-2.33.0
-

0005-arm64-fix-SDEI-stack-frame-unwind-while-UNW_4_14-is-.patch

@@ -1,46 +0,0 @@
-From 45685956da58b15d4542d59b95888b1968980c68 Mon Sep 17 00:00:00 2001
-From: Xiaoguang Wang <lege.wang@jaguarmicro.com>
-Date: Thu, 7 Nov 2024 14:40:07 +0800
-Subject: [PATCH] arm64: fix SDEI stack frame unwind while UNW_4_14 is set
-
-Fix two bugs:
-  1) If BT_IRQSTACK is set, both irq_stack and sdei_normal_stack need
-     to be checked while switching to process stack.
-  2) Use bt->frameptr in arm64_unwind_frame() just like irq stack.
-
-Fixes: 442da89f4898 ("crash: add SDEI stack resolution")
-Signed-off-by: Xiaoguang Wang <lege.wang@jaguarmicro.com>
----
- 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
-@@ -3244,10 +3244,10 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
- 
- 	if (machdep->flags & UNW_4_14) {
- 		if (((bt->flags & BT_IRQSTACK) &&
--		     !arm64_on_irq_stack(bt->tc->processor, frame->fp)) ||
-+		     !arm64_on_irq_stack(bt->tc->processor, frame->fp) &&
-+			 !arm64_in_sdei_normal_stack(bt->tc->processor, frame->fp)) ||
- 		    ((bt->flags & BT_OVERFLOW_STACK) &&
--		     !arm64_on_overflow_stack(bt->tc->processor, frame->fp)) &&
--		     !arm64_in_sdei_normal_stack(bt->tc->processor, frame->fp)) {
-+		     !arm64_on_overflow_stack(bt->tc->processor, frame->fp))) {
- 			if (arm64_on_process_stack(bt, frame->fp)) {
- 				arm64_set_process_stack(bt);
- 
-@@ -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
-

add-SDEI-stack-resolution.patch

@@ -31,38 +31,40 @@ PID: 55429  TASK: ffff802772e3ae80  CPU: 19  COMMAND: "insmod"
 
 Signed-off-by: Jialong Chen <chenjialong@huawei.com>
 ---
- arm64.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ arm64.c | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
  defs.h  |   3 +
- 2 files changed, 212 insertions(+), 4 deletions(-)
+ 2 files changed, 209 insertions(+), 4 deletions(-)
 
 diff --git a/arm64.c b/arm64.c
-index c3e26a3..d293e6c 100644
+index fdf77bd..cc32d9d 100644
 --- a/arm64.c
 +++ b/arm64.c
-@@ -93,6 +93,11 @@ static void arm64_calc_VA_BITS(void);
+@@ -87,6 +87,10 @@ static void arm64_calc_VA_BITS(void);
+ static int arm64_is_uvaddr(ulong, struct task_context *);
  static void arm64_calc_KERNELPACMASK(void);
- static int arm64_get_vmcoreinfo(unsigned long *vaddr, const char *label, int base);
-
+ 
 +static int arm64_in_sdei_normal_stack(int cpu, ulong stkptr);
 +static void arm64_set_sdei_normal_stack(struct bt_info *bt);
 +static void arm64_sdei_stack_init(void);
 +static int arm64_in_kdump_text_on_sdei_stack(struct bt_info *bt);
-+
- struct kernel_range {
- 	unsigned long modules_vaddr, modules_end;
- 	unsigned long vmalloc_start_addr, vmalloc_end;
-@@ -520,6 +525,7 @@ arm64_init(int when)
+ 
+ /*
+  * Do all necessary machine-specific setup here. This is called several times
+@@ -461,6 +465,7 @@ arm64_init(int when)
+ 
  		arm64_irq_stack_init();
- 		arm64_overflow_stack_init();
  		arm64_stackframe_init();
 +		arm64_sdei_stack_init();
  		break;
  
- 	case POST_INIT:
-@@ -2174,6 +2180,70 @@ arm64_irq_stack_init(void)
- 	} 
- }
- 
+ 	case POST_VM:
+@@ -1655,6 +1660,70 @@ arm64_irq_stack_init(void)
+ 			readmem(p, KVADDR, &(ms->irq_stacks[i]), sizeof(ulong),
+ 			    "IRQ stack pointer", RETURN_ON_ERROR);
+ 		}
++	}
++}
++
 +/*
 + *  Gather IRQ stack values.
 + */
@@ -124,13 +126,10 @@ index c3e26a3..d293e6c 100644
 +			readmem(p, KVADDR, &(ms->sdei_stacks[i]), sizeof(ulong),
 +			    "SDEI stack pointer", RETURN_ON_ERROR);
 +		}
-+	}
-+}
-+
- /*
-  *  Gather Overflow stack values.
-  *
-@@ -2736,7 +2806,7 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
+ 	} 
+ }
+ 
+@@ -2173,7 +2242,7 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
  {
  	unsigned long high, low, fp;
  	unsigned long stack_mask;
@@ -139,17 +138,17 @@ index c3e26a3..d293e6c 100644
  	struct arm64_pt_regs *ptregs;
  	struct machine_specific *ms = machdep->machspec;
  
-@@ -2765,7 +2835,8 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
- 		if (((bt->flags & BT_IRQSTACK) &&
- 		     !arm64_on_irq_stack(bt->tc->processor, frame->fp)) ||
- 		    ((bt->flags & BT_OVERFLOW_STACK) &&
--		     !arm64_on_overflow_stack(bt->tc->processor, frame->fp))) {
-+		     !arm64_on_overflow_stack(bt->tc->processor, frame->fp)) &&
-+		     !arm64_in_sdei_normal_stack(bt->tc->processor, frame->fp)) {
+@@ -2203,7 +2272,8 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
+ 
+ 	if (machdep->flags & UNW_4_14) {
+ 		if ((bt->flags & BT_IRQSTACK) &&
+-		    !arm64_on_irq_stack(bt->tc->processor, frame->fp)) {
++			!arm64_on_irq_stack(bt->tc->processor, frame->fp) &&
++			!arm64_in_sdei_normal_stack(bt->tc->processor, frame->fp)) {
  			if (arm64_on_process_stack(bt, frame->fp)) {
  				arm64_set_process_stack(bt);
  
-@@ -2805,6 +2876,7 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
+@@ -2243,6 +2313,7 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
  	 *  orig_sp = IRQ_STACK_TO_TASK_STACK(irq_stack_ptr);   (pt_regs pointer on process stack)
  	 */
  	irq_stack_ptr = ms->irq_stacks[bt->tc->processor] + ms->irq_stack_size - 16;
@@ -157,7 +156,7 @@ index c3e26a3..d293e6c 100644
  
  	if (frame->sp == irq_stack_ptr) {
  		orig_sp = GET_STACK_ULONG(irq_stack_ptr - 8);
-@@ -2825,6 +2897,25 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
+@@ -2263,6 +2334,25 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
  				frame->fp, INSTACK(frame->fp, bt) ? "" : " (?)");
  			return FALSE;
  		}
@@ -183,7 +182,7 @@ index c3e26a3..d293e6c 100644
  	}
  
  	return TRUE;
-@@ -3164,6 +3255,10 @@ arm64_back_trace_cmd(struct bt_info *bt)
+@@ -2602,6 +2692,10 @@ arm64_back_trace_cmd(struct bt_info *bt)
  			arm64_set_irq_stack(bt);
  			bt->flags |= BT_IRQSTACK;
  		}
@@ -194,43 +193,42 @@ index c3e26a3..d293e6c 100644
  		stackframe.fp = GET_STACK_ULONG(bt->bptr - 8);
  		stackframe.pc = GET_STACK_ULONG(bt->bptr);
  		stackframe.sp = bt->bptr + 8;
-@@ -3173,6 +3268,10 @@ arm64_back_trace_cmd(struct bt_info *bt)
+@@ -2611,6 +2705,10 @@ arm64_back_trace_cmd(struct bt_info *bt)
  			arm64_set_irq_stack(bt);
  			bt->flags |= BT_IRQSTACK;
  		}
-+		if (arm64_in_sdei_normal_stack(bt->tc->processor, bt->bptr)) {
++		if (arm64_in_sdei_normal_stack(bt->tc->processor, bt->hp->esp)) {
 +			arm64_set_sdei_normal_stack(bt);
 +			bt->flags |= BT_IRQSTACK;
 +		}
  		stackframe.fp = GET_STACK_ULONG(bt->hp->esp - 8);
  		stackframe.pc = bt->hp->eip ? 
  			bt->hp->eip : GET_STACK_ULONG(bt->hp->esp);
-@@ -3186,6 +3285,10 @@ arm64_back_trace_cmd(struct bt_info *bt)
- 			arm64_set_overflow_stack(bt);
- 			bt->flags |= BT_OVERFLOW_STACK;
+@@ -2621,6 +2719,10 @@ arm64_back_trace_cmd(struct bt_info *bt)
+ 			arm64_set_irq_stack(bt);
+ 			bt->flags |= BT_IRQSTACK;
  		}
-+		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;
 +		}
  		stackframe.sp = bt->stkptr;
  		stackframe.pc = bt->instptr;
  		stackframe.fp = bt->frameptr;
-@@ -3249,7 +3352,8 @@ arm64_back_trace_cmd(struct bt_info *bt)
+@@ -2682,7 +2784,8 @@ arm64_back_trace_cmd(struct bt_info *bt)
  		}
  
  		if ((bt->flags & BT_IRQSTACK) &&
 -		    !arm64_on_irq_stack(bt->tc->processor, stackframe.fp)) {
-+		    !arm64_on_irq_stack(bt->tc->processor, stackframe.fp) &&
-+		    !arm64_in_sdei_normal_stack(bt->tc->processor, stackframe.fp)) {
++			!arm64_on_irq_stack(bt->tc->processor, stackframe.fp) &&
++			!arm64_in_sdei_normal_stack(bt->tc->processor, stackframe.fp)) {
  			bt->flags &= ~BT_IRQSTACK;
  			if (arm64_switch_stack(bt, &stackframe, ofp) == USER_MODE)
  				break;
-@@ -3537,6 +3641,81 @@ arm64_in_kdump_text(struct bt_info *bt, struct arm64_stackframe *frame)
- 	return FALSE;
+@@ -2965,6 +3068,79 @@ arm64_in_kdump_text(struct bt_info *bt, struct arm64_stackframe *frame)
  }
  
-+static int
+ static int
 +arm64_in_kdump_text_on_sdei_stack(struct bt_info *bt)
 +{
 +	int cpu;
@@ -243,8 +241,6 @@ index c3e26a3..d293e6c 100644
 +		return FALSE;
 +
 +	ms = machdep->machspec;
-+	if (!ms->sdei_stacks)
-+		return FALSE;
 +	cpu = bt->tc->processor;
 +	stackbase = ms->sdei_stacks[cpu];
 +	stackbuf = GETBUF(ms->sdei_stack_size);
@@ -261,7 +257,7 @@ index c3e26a3..d293e6c 100644
 +
 +	for (ptr = start - 8; ptr >= base; ptr--) {
 +		if (bt->flags & BT_OPT_BACK_TRACE) {
-+			if ((*ptr > ms->crash_kexec_start) &&
++			if ((*ptr >= ms->crash_kexec_start) &&
 +			    (*ptr < ms->crash_kexec_end) &&
 +			    INSTACK(*(ptr - 1), bt)) {
 +				bt->bptr = ((ulong)(ptr - 1) - (ulong)base) + stackbase;
@@ -271,7 +267,7 @@ index c3e26a3..d293e6c 100644
 +				FREEBUF(stackbuf);
 +				return TRUE;
 +			}
-+			if ((*ptr > ms->crash_save_cpu_start) &&
++			if ((*ptr >= ms->crash_save_cpu_start) &&
 +			    (*ptr < ms->crash_save_cpu_end) &&
 +			    INSTACK(*(ptr - 1), bt)) {
 +				bt->bptr = ((ulong)(ptr - 1) - (ulong)base) + stackbase;
@@ -282,7 +278,7 @@ index c3e26a3..d293e6c 100644
 +				return TRUE;
 +			}
 +		} else {
-+			if ((*ptr > ms->crash_kexec_start) && (*ptr < ms->crash_kexec_end)) {
++			if ((*ptr >= ms->crash_kexec_start) && (*ptr < ms->crash_kexec_end)) {
 +				bt->bptr = ((ulong)ptr - (ulong)base) + stackbase;
 +				if (CRASHDEBUG(1))
 +					fprintf(fp, "%lx: %lx (crash_kexec on IRQ stack)\n",
@@ -290,7 +286,7 @@ index c3e26a3..d293e6c 100644
 +				FREEBUF(stackbuf);
 +				return TRUE;
 +			}
-+			if ((*ptr > ms->crash_save_cpu_start) && (*ptr < ms->crash_save_cpu_end)) {
++			if ((*ptr >= ms->crash_save_cpu_start) && (*ptr < ms->crash_save_cpu_end)) {
 +				bt->bptr = ((ulong)ptr - (ulong)base) + stackbase;
 +				if (CRASHDEBUG(1))
 +					fprintf(fp, "%lx: %lx (crash_save_cpu on IRQ stack)\n",
@@ -305,21 +301,22 @@ index c3e26a3..d293e6c 100644
 +	return FALSE;
 +}
 +
- static int
++static int
  arm64_in_kdump_text_on_irq_stack(struct bt_info *bt)
  {
-@@ -3727,7 +3906,8 @@ try_kernel:
+ 	int cpu;
+@@ -3111,7 +3287,8 @@ try_kernel:
  	}
  
  	if (arm64_in_kdump_text(bt, frame) || 
--	    arm64_in_kdump_text_on_irq_stack(bt)) {
+-	    arm64_in_kdump_text_on_irq_stack(bt))
 +	    arm64_in_kdump_text_on_irq_stack(bt) ||
-+	    arm64_in_kdump_text_on_sdei_stack(bt)) {
++	    arm64_in_kdump_text_on_sdei_stack(bt))
  		bt->flags |= BT_KDUMP_ADJUST;
- 		if (skip && is_idle_thread(bt->task))
- 			bt->flags |= BT_SKIP_IDLE;
-@@ -4488,6 +4668,31 @@ arm64_on_overflow_stack(int cpu, ulong stkptr)
- 			ms->overflow_stacks, ms->overflow_stack_size);
+ 
+ 	return TRUE;
+@@ -3804,6 +3981,31 @@ arm64_in_alternate_stack(int cpu, ulong stkptr)
+ 	return FALSE;
  }
  
 +static int
@@ -330,7 +327,7 @@ index c3e26a3..d293e6c 100644
 +	if (!ms->sdei_stack_size || (cpu >= kt->cpus))
 +		return FALSE;
 +
-+	if ((stkptr > ms->sdei_stacks[cpu]) &&
++	if ((stkptr >= ms->sdei_stacks[cpu]) &&
 +	    (stkptr < (ms->sdei_stacks[cpu] + ms->sdei_stack_size)))
 +		return TRUE;
 +
@@ -351,10 +348,10 @@ index c3e26a3..d293e6c 100644
  arm64_set_irq_stack(struct bt_info *bt)
  {
 diff --git a/defs.h b/defs.h
-index afdcf6c..4885d55 100644
+index 9594950..9cd5ffa 100644
 --- a/defs.h
 +++ b/defs.h
-@@ -3376,6 +3376,9 @@ struct machine_specific {
+@@ -3283,6 +3283,9 @@ struct machine_specific {
  	ulong irq_stack_size;
  	ulong *irq_stacks;
  	char  *irq_stackbuf;
@@ -363,7 +360,7 @@ index afdcf6c..4885d55 100644
 +	char  *sdei_stackbuf;
  	ulong __irqentry_text_start;
  	ulong __irqentry_text_end;
- 	ulong overflow_stack_size;
+ 	/* for exception vector code */
 -- 
-2.27.0
+2.13.7
 

backport-fix-for-sys-to-properly-display-the-PANIC-m.patch

@@ -1,66 +0,0 @@
-From db0077614aaeda6d0ed557f2b91d3349d5fe430f Mon Sep 17 00:00:00 2001
-From: Austin Kim <austindh.kim@gmail.com>
-Date: Tue, 29 Oct 2024 17:32:07 +0900
-Subject: [PATCH] Fix for 'sys' to properly display the PANIC message
-
-Using 'sys' command, we can view the panic message with general system
-information. If we run RISCV64-based vmcore, PANIC message is not properly
-displayed.
-
-The reason is that the string "Unable to handle kernel" is not
-completely matched with the panic_msg[]. The corresponding kernel commit
-is 21733cb518471.
-
-Without the patch:
-  crash> sys
-        KERNEL: vmlinux  [TAINTED]
-      DUMPFILE: vmcore
-          CPUS: 4
-          DATE: Thu Aug 22 16:13:08 KST 2024
-        UPTIME: 00:33:25
-  LOAD AVERAGE: 0.07, 0.07, 0.02
-         TASKS: 385
-      NODENAME: starfive
-       RELEASE: 6.6.20+
-       VERSION: #13 SMP Mon Aug 19 12:58:52 KST 2024
-       MACHINE: riscv64  (unknown Mhz)
-        MEMORY: 4 GB
-         PANIC: ""
-
-With the patch:
-  crash> sys
-        KERNEL: vmlinux  [TAINTED]
-      DUMPFILE: vmcore
-          CPUS: 4
-          DATE: Thu Aug 22 16:13:08 KST 2024
-        UPTIME: 00:33:25
-  LOAD AVERAGE: 0.07, 0.07, 0.02
-         TASKS: 385
-      NODENAME: starfive
-       RELEASE: 6.6.20+
-       VERSION: #13 SMP Mon Aug 19 12:58:52 KST 2024
-       MACHINE: riscv64  (unknown Mhz)
-        MEMORY: 4 GB
-         PANIC: "Unable to handle kernel access to user memory without uaccess routines at virtual address 0000000000000000"
-
-Signed-off-by: Austin Kim <austindh.kim@gmail.com>
----
- task.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/task.c b/task.c
-index c131cc32..33de7da2 100644
---- a/task.c
-+++ b/task.c
-@@ -6392,6 +6392,11 @@ get_panicmsg(char *buf)
- 			get_symbol_data("sysrq_pressed", sizeof(int), &msg_found);
- 			break;
- 		}
-+
-+		/*
-+		 *  Try to search panic string in panic keywords
-+		 */
-+		search_panic_task_by_keywords(buf, &msg_found);
- 	}
- 
- found:

crash.spec

@@ -1,28 +1,22 @@
 Name: crash
-Version: 8.0.5
-Release: 9
+Version: 7.2.9
+Release: 2
 Summary: Linux kernel crash utility.
 License: GPLv3
 URL: https://crash-utility.github.io
-Source0: https://github.com/crash-utility/crash/archive/refs/tags/%{version}.tar.gz
-Source1: http://ftp.gnu.org/gnu/gdb/gdb-10.2.tar.gz
+Source0: https://github.com/crash-utility/crash/archive/%{version}.tar.gz
+Source1: http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz
 
-Patch0: 0000-lzo_snappy.patch
-Patch1: 0001-add-SDEI-stack-resolution.patch
-Patch2: 0002-crash-8.0.2-sw.patch
-Patch3: 0003-crash-8.0.4-add-support-for-loongarch64.patch
-Patch4: 0004-arm64-fix-a-potential-segfault-when-unwind-frame.patch
-Patch5: 0005-arm64-fix-SDEI-stack-frame-unwind-while-UNW_4_14-is-.patch
-Patch9001: huawei-fix-ps-error-when-mm_struct.rss_stat-is-lazy-initial.patch
-%ifarch riscv64
-Patch6: backport-fix-for-sys-to-properly-display-the-PANIC-m.patch
-%endif
+Patch0: lzo_snappy.patch
+Patch1: use_system_readline_v3.patch
 
-BuildRequires: ncurses-devel zlib-devel lzo-devel snappy-devel texinfo libzstd-devel 
-BuildRequires: gcc gcc-c++ bison m4
+Patch9000: add-SDEI-stack-resolution.patch
+
+BuildRequires: ncurses-devel zlib-devel lzo-devel snappy-devel
+BuildRequires: gcc gcc-c++ bison readline-devel
 Requires: binutils
 
-Provides: bundled(libiberty) bundled(gdb) = 10.2
+Provides: bundled(libiberty) bundled(gdb) = 7.6
 
 %description
 The core analysis suite is a self-contained tool that can be used to
@@ -47,28 +41,11 @@ created by manufacturer-specific firmware.
 %package_help
 
 %prep
-%setup -n %{name}-%{version}
-
-%patch 0 -p1 
-%patch 1 -p1 
-
-%ifarch sw_64
-%patch 2 -p1
-%endif
-%ifarch loongarch64
-%patch 3 -p1
-%endif
-
-%patch 4 -p1
-%patch 5 -p1
-%patch 9001 -p1
-%ifarch riscv64
-%patch 6 -p1
-%endif
+%autosetup -n %{name}-%{version} -p1
 
 %build
 cp %{SOURCE1} .
-make -j`nproc` RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
+make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
 
 %install
 rm -rf %{buildroot}
@@ -99,102 +76,6 @@ install -D -m 0644 defs.h %{buildroot}%{_includedir}/%{name}/defs.h
 %{_mandir}/man8/crash.8*
 
 %changelog
-* Mon Jul 14 2025 liuzhilin <liuzhilin@kylinos.cn> - 8.0.5-9
-- backport Fix for 'sys' to properly display the PANIC message patch.
-
-* Wed Jun 04 2025 wangxiao <wangxiao184@h-partners.com> - 8.0.5-8
-- use patch command to apply patches for consistency in context
-
-* Wed May 21 2025 zhangjian <zhangjian496@huawei.com> - 8.0.5-7
-- fix ps error when mm_struct.rss_stat is lazy initialized
-
-* Wed Dec 04 2024 yangzhenyu <dev11101@linx-info.com> - 8.0.5-6
-- remove the architecture judgment in the patches section;
-- include all patches in the source package.
-
-* Wed Nov 20 2024 Xiaoguang Wang <lege.wang@jaguarmicro.com> - 8.0.5-5
-- arm64: fix SDEI stack frame unwind while UNW_4_14 is set
-
-* Wed Nov 13 2024 wangxiao <wangxiao184@h-partners.com> - 8.0.5-4
-- use autosetup instead of setup in prep stage
-
-* Tue Nov 12 2024 wangxiao <wangxiao184@h-partners.com> - 8.0.5-3
-- arm64: fix a potential segfault when unwind frame
-
-* Tue Nov 05 2024 xuguangmin <xuguangmin@kylinos.cn> - 8.0.5-2
-- Fix build warning:%patchN is deprecated (3 usages found), use %patch N
-
-* Thu Jul 25 2024 dillon chen<dillon.chen@gmail.com> - 8.0.5-1
-- Upgrade to crash-8.0.5
-
-* Tue May 28 2024 shaojiansong <shaojiansong@kylinos.cn> - 8.0.4-3
-- Fix lack of loongarch64 and sw_64 patch files in src.rpm package which is build from any platform.
-
-* Tue Apr 16 2024 Pengda Dou <doupengda@loongson.cn> - 8.0.4-2
-- Resolve loongarch64 patch add error
-- add support for loongarch64
-
-* Thu Jan 25 2024 chenhaixiang<chenhaixiang3@huawei.com> - 8.0.4-1
-- Upgrade to crash-8.0.4
-
-* Tue Aug 1 2023 chenhaixiang<chenhaixiang3@huawei.com> - 8.0.2-4
-- Fix compilation error due to new strlcpy function that glibc added
-
-* Mon Jul 10 2023 wangming <wangming01@loongson.cn> - 8.0.2-3
-- add LoongArch64 support.
-
-* Fri Jul 7 2023 EastDong <xudong23@iscas.ac.cn> - 8.0.2-2
-- add riscv64 support
-
-* Sun Jan 29 2023 chenhaixiang<chenhaixiang3@huawei.com> - 8.0.2-1
-- update to crash-8.0.2
-
-* Wed Jan 4 2023 lijianglin<lijianglin2@huawei.com> - 7.3.0-12
-- fix segfault by "bt" command with offline cpus
-
-* Thu Dec 29 2022 huskartang <tanly6@chinatelecom.cn> - 7.3.0-11
-- Fix the value of TIF_SIGPENDING macro
-
-* Thu Dec 29 2022 huskartang <tanly6@chinatelecom.cn> - 7.3.0-10
-- Fix "kmem -s|-S" option on Linux 5.7 and later kernels
-
-* Thu Dec 29 2022 huskartang <tanly6@chinatelecom.cn> - 7.3.0-9
-- Add lowercase tcr_el1_t1sz
-
-* Wed Dec 28 2022 huskartang <tanly6@chinatelecom.cn> - 7.3.0-8
-- rename pathes to keep in order
-
-* Thu Dec 1 2022 Ding Hui <dinghui@sangfor.com.cn> - 7.3.0-7
-- fix backtraces of arm64 KASAN kernel dumpfile truncated
-
-* Wed Oct 19 2022 wuzx<wuzx1226@qq.com> - 7.3.0-6
-- add sw64 patch
-
-* Wed Feb 23 2022 wangbin <wangbin224@huawei.com> - 7.3.0-5
-- Handle task_struct cpu member changes for kernels >= 5.16-rc1
-  and delete use_system_readline_v3.patch
-
-* Tue Feb 8 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 7.3.0-4
-- revert to fix null pointer reference when CONFIG_KASAN is open
-
-* Fri Dec 31 2021 zhouwenpei <zhouwenpei1@huawei.com> - 7.3.0-3
-- add SDEI stack resolution
-
-* Thu Dec 30 2021 zhouwenpei <zhouwenpei1@huawei.com> - 7.3.0-2
-- fix seek error "IRQ stack pointer"
-
-* Tue Nov 30 2021 zhouwenpei <zhouwenpei1@huawei.com> - 7.3.0-1
-- Upgrade version to 7.3.0
-
-* Fri Sep 03 2021 wangbin <wangbin224@huawei.com> - 7.2.9-5
-- fix null pointer reference when CONFIG_KASAN is open
-
-* Tue Jun 29 2021 zhouwenpei <zhouwenpei1@huawei.com> - 7.2.9-4
-- add buildrequires m4
-
-* Mon May 10 2021 shixuantong <shixuantong@huawei.com> - 7.2.9-3
-- add -j option for building efficiency optimization
-
 * Thu Apr 08 2021 shixuantong <shixuantong@huawei.com> - 7.2.9-2
 - fix patch issue in upgrade version commit
 

huawei-fix-ps-error-when-mm_struct.rss_stat-is-lazy-initial.patch

@@ -1,28 +0,0 @@
-From 45052609f61d5d4ee8286d0d6098e53ea6b199a9 Mon Sep 17 00:00:00 2001
-From: zhangjian <zhangjian496@huawei.com>
-Date: Wed, 21 May 2025 02:08:12 +0000
-Subject: [PATCH] tmp
-
----
- tools.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tools.c b/tools.c
-index 0f2db10..727a12c 100644
---- a/tools.c
-+++ b/tools.c
-@@ -6955,6 +6955,11 @@ percpu_counter_sum_positive(ulong fbc)
- 	readmem(fbc + OFFSET(percpu_counter_counters), KVADDR, &addr,
- 		sizeof(void *), "percpu_counter.counters", FAULT_ON_ERROR);
- 
-+	/* maybe mm_struct.rss_stat is lazy initialized */
-+	if (!addr) {
-+		return ret;
-+	}
-+
- 	for (i = 0; i < kt->cpus; i++) {
- 		readmem(addr + kt->__per_cpu_offset[i], KVADDR, &count,
- 			sizeof(int), "percpu_counter.counters count", FAULT_ON_ERROR);
--- 
-2.33.0
-

lzo_snappy.patch

@@ -1,23 +1,22 @@
---- crash-8.0.4/diskdump.c.orig
-+++ crash-8.0.4/diskdump.c
-@@ -23,6 +23,9 @@
+--- crash-7.1.4/diskdump.c.orig
++++ crash-7.1.4/diskdump.c
+@@ -23,6 +23,8 @@
   * GNU General Public License for more details.
   */
  
 +#define LZO
 +#define SNAPPY
-+#define ZSTD
  #include "defs.h"
  #include "diskdump.h"
  #include "xen_dom0.h"
---- crash-8.0.4/Makefile.orig
-+++ crash-8.0.4/Makefile
-@@ -256,7 +256,7 @@ all: make_configure
+--- crash-7.1.4/Makefile.orig
++++ crash-7.1.4/Makefile
+@@ -228,7 +228,7 @@ all: make_configure
  gdb_merge: force
  	@if [ ! -f ${GDB}/README ]; then \
- 	  $(MAKE) gdb_unzip; fi
+ 	  make --no-print-directory gdb_unzip; fi
 -	@echo "${LDFLAGS} -lz -ldl -rdynamic" > ${GDB}/gdb/mergelibs
-+	@echo "${LDFLAGS} -lz -llzo2 -lsnappy -lzstd -ldl -rdynamic" > ${GDB}/gdb/mergelibs
++	@echo "${LDFLAGS} -lz -llzo2 -lsnappy -ldl -rdynamic" > ${GDB}/gdb/mergelibs
  	@echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj
  	@rm -f ${PROGRAM}
  	@if [ ! -f ${GDB}/config.status ]; then \

use_system_readline_v3.patch

@@ -0,0 +1,32 @@
+--- crash-7.0.7/cmdline.c.orig
++++ crash-7.0.7/cmdline.c
+@@ -44,7 +44,8 @@ static int verify_args_input_file(char *
+ #define READLINE_LIBRARY
+ 
+ #include <readline.h>
+-#include <rldefs.h>
++#define vi_mode 0
++#define emacs_mode 1
+ #include <history.h>
+ 
+ static void readline_init(void);
+--- crash-7.0.7/Makefile.orig
++++ crash-7.0.7/Makefile
+@@ -205,7 +205,7 @@ TAR_FILES=${SOURCE_FILES} Makefile ${GPL
+ 	${EXTENSION_SOURCE_FILES} ${MEMORY_DRIVER_FILES}
+ CSCOPE_FILES=${SOURCE_FILES}
+ 
+-READLINE_DIRECTORY=./${GDB}/readline
++READLINE_DIRECTORY=/usr/include/readline
+ BFD_DIRECTORY=./${GDB}/bfd
+ GDB_INCLUDE_DIRECTORY=./${GDB}/include
+ 
+@@ -233,7 +233,7 @@ gdb_merge: force
+ 	@rm -f ${PROGRAM}
+ 	@if [ ! -f ${GDB}/config.status ]; then \
+ 	  (cd ${GDB}; ./configure ${GDB_CONF_FLAGS} --with-separate-debug-dir=/usr/lib/debug \
+-	    --with-bugurl="" --with-expat=no --with-python=no --disable-sim; \
++	    --with-bugurl="" --with-expat=no --with-python=no --disable-sim --with-system-readline; \
+ 	  make --no-print-directory CRASH_TARGET=${TARGET}; echo ${TARGET} > crash.target) \
+ 	else make --no-print-directory rebuild; fi
+ 	@if [ ! -f ${PROGRAM} ]; then \