]> Git Repo - J-linux.git/commitdiff
x86/unwind/orc: Fix unwind for newly forked tasks
authorZheng Yejian <[email protected]>
Fri, 13 Sep 2024 02:45:01 +0000 (10:45 +0800)
committerJosh Poimboeuf <[email protected]>
Thu, 17 Oct 2024 22:13:07 +0000 (15:13 -0700)
When arch_stack_walk_reliable() is called to unwind for newly forked
tasks, the return value is negative which means the call stack is
unreliable. This obviously does not meet expectations.

The root cause is that after commit 3aec4ecb3d1f ("x86: Rewrite
 ret_from_fork() in C"), the 'ret_addr' of newly forked task is changed
to 'ret_from_fork_asm' (see copy_thread()), then at the start of the
unwind, it is incorrectly interprets not as a "signal" one because
'ret_from_fork' is still used to determine the initial "signal" (see
__unwind_start()). Then the address gets incorrectly decremented in the
call to orc_find() (see unwind_next_frame()) and resulting in the
incorrect ORC data.

To fix it, check 'ret_from_fork_asm' rather than 'ret_from_fork' in
__unwind_start().

Fixes: 3aec4ecb3d1f ("x86: Rewrite ret_from_fork() in C")
Signed-off-by: Zheng Yejian <[email protected]>
Signed-off-by: Josh Poimboeuf <[email protected]>
arch/x86/kernel/unwind_orc.c

index d00c28aaa5be45988ce4bd2177d7dba857e574fc..d4705a348a80451c3abb309985784e8efab0999a 100644 (file)
@@ -723,7 +723,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task,
                state->sp = task->thread.sp + sizeof(*frame);
                state->bp = READ_ONCE_NOCHECK(frame->bp);
                state->ip = READ_ONCE_NOCHECK(frame->ret_addr);
-               state->signal = (void *)state->ip == ret_from_fork;
+               state->signal = (void *)state->ip == ret_from_fork_asm;
        }
 
        if (get_stack_info((unsigned long *)state->sp, state->task,
This page took 0.049151 seconds and 4 git commands to generate.