Unverified Commit 77e7b353 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15755 x86/dumpstack: Fix inaccurate unwinding from exception stacks due to misplaced assignment 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Zhongjin <chenzhongjin@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/33EHMRXK67QWXPYPMCXYUE627FCYRGB4/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBYAPJ 
 
Link:https://gitee.com/openeuler/kernel/pulls/15755

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 3e1e5bde e9d26ca9

arch/x86/kernel/dumpstack.c

+2 −3
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ static void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, 
	printk("%sCall Trace:\n", log_lvl);



	unwind_start(&state, task, regs, stack);

	stack = stack ?: get_stack_pointer(task, regs);

	regs = unwind_get_entry_regs(&state, &partial);



	/*
@@ -213,9 +214,7 @@ static void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, 
	 * - hardirq stack

	 * - entry stack

	 */

	for (stack = stack ?: get_stack_pointer(task, regs);

	     stack;

	     stack = stack_info.next_sp) {

	for (; stack; stack = stack_info.next_sp) {

		const char *stack_name;



		stack = PTR_ALIGN(stack, sizeof(long));