This is a note to let you know that I've just added the patch titled
x86/entry/64: Fix unwind hints in rewind_stack_do_exit()
to the 5.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-entry-64-fix-unwind-hints-in-rewind_stack_do_exit.patch
and it can be found in the queue-5.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From f977df7b7ca45a4ac4b66d30a8931d0434c394b1 Mon Sep 17 00:00:00 2001
From: Jann Horn <jannh@xxxxxxxxxx>
Date: Sat, 25 Apr 2020 05:03:04 -0500
Subject: x86/entry/64: Fix unwind hints in rewind_stack_do_exit()
From: Jann Horn <jannh@xxxxxxxxxx>
commit f977df7b7ca45a4ac4b66d30a8931d0434c394b1 upstream.
The LEAQ instruction in rewind_stack_do_exit() moves the stack pointer
directly below the pt_regs at the top of the task stack before calling
do_exit(). Tell the unwinder to expect pt_regs.
Fixes: 8c1f75587a18 ("x86/entry/64: Add unwind hint annotations")
Reviewed-by: Miroslav Benes <mbenes@xxxxxxx>
Signed-off-by: Jann Horn <jannh@xxxxxxxxxx>
Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxx>
Cc: Dave Jones <dsj@xxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Vince Weaver <vincent.weaver@xxxxxxxxx>
Link: https://lore.kernel.org/r/68c33e17ae5963854916a46f522624f8e1d264f2.1587808742.git.jpoimboe@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/entry/entry_64.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -1739,7 +1739,7 @@ SYM_CODE_START(rewind_stack_do_exit)
movq PER_CPU_VAR(cpu_current_top_of_stack), %rax
leaq -PTREGS_SIZE(%rax), %rsp
- UNWIND_HINT_FUNC sp_offset=PTREGS_SIZE
+ UNWIND_HINT_REGS
call do_exit
SYM_CODE_END(rewind_stack_do_exit)
Patches currently in stable-queue which might be from jannh@xxxxxxxxxx are
queue-5.6/x86-entry-64-fix-unwind-hints-in-kernel-exit-path.patch
queue-5.6/x86-unwind-orc-don-t-skip-the-first-frame-for-inactive-tasks.patch
queue-5.6/x86-unwind-orc-prevent-unwinding-before-orc-initialization.patch
queue-5.6/x86-entry-64-fix-unwind-hints-in-__switch_to_asm.patch
queue-5.6/x86-unwind-orc-fix-error-path-for-bad-orc-entry-type.patch
queue-5.6/x86-entry-64-fix-unwind-hints-in-rewind_stack_do_exit.patch
queue-5.6/x86-unwind-orc-fix-premature-unwind-stoppage-due-to-iret-frames.patch
queue-5.6/x86-entry-64-fix-unwind-hints-in-register-clearing-code.patch
queue-5.6/objtool-fix-stack-offset-tracking-for-indirect-cfas.patch
