Re: Resend: [PATCH] x86-64: fix unwind annotations in syscall stubs

[Alexander van Heukelum]

On Thu, 02 Sep 2010 13:52 +0100, "Jan Beulich" <JBeulich@xxxxxxxxxx> wrote:
> With the return address removed from the stack, these should really
> refer to their caller's register state.
> 
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
> 
> ---
>  arch/x86/kernel/entry_64.S |    7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> --- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
> +++ 2.6.36-rc3-x86_64-stub-unwind-annotations/arch/x86/kernel/entry_64.S
> @@ -714,9 +714,8 @@ END(ptregscall_common)
>  
>  ENTRY(stub_execve)
>  	CFI_STARTPROC
> -       popq %r11
> -       CFI_ADJUST_CFA_OFFSET -8
> -       CFI_REGISTER rip, r11
> +       addq $8, %rsp
> +       PARTIAL_FRAME 0
>  	SAVE_REST
>  	FIXUP_TOP_OF_STACK %r11
>  	movq %rsp, %rcx
> @@ -735,7 +734,7 @@ END(stub_execve)
>  ENTRY(stub_rt_sigreturn)
>  	CFI_STARTPROC
>  	addq $8, %rsp
> -       CFI_ADJUST_CFA_OFFSET   -8
> +       PARTIAL_FRAME 0
>  	SAVE_REST
>  	movq %rsp,%rdi
>  	FIXUP_TOP_OF_STACK %r11
> 

Thanks for creating these...

Acked-by: Alexander van Heukelum <heukelum@xxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/