* [PATCH] x86-64: fix CFI coverage for error_entry()
@ 2010-06-30 13:28 Jan Beulich
2010-06-30 20:04 ` Cyrill Gorcunov
0 siblings, 1 reply; 3+ messages in thread
From: Jan Beulich @ 2010-06-30 13:28 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: linux-kernel
The scope should really extend to the end of the function, not the
return location.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- linux-2.6.35-rc3/arch/x86/kernel/entry_64.S
+++ 2.6.35-rc3-x86_64-unwind-annotations/arch/x86/kernel/entry_64.S
@@ -1442,7 +1441,6 @@ error_swapgs:
error_sti:
TRACE_IRQS_OFF
ret
- CFI_ENDPROC
/*
* There are two places in the kernel that can potentially fault with
@@ -1467,6 +1465,7 @@ bstep_iret:
/* Fix truncated RIP */
movq %rcx,RIP+8(%rsp)
jmp error_swapgs
+ CFI_ENDPROC
END(error_entry)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] x86-64: fix CFI coverage for error_entry()
@ 2010-09-03 6:36 Jan Beulich
0 siblings, 0 replies; 3+ messages in thread
From: Jan Beulich @ 2010-09-03 6:36 UTC (permalink / raw)
To: mingo, tglx, hpa; +Cc: heukelum, linux-kernel
The scope should really extend to the end of the function, not the
return location.
(Subject was wrong in the variant I sent yesterday.)
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
---
arch/x86/kernel/entry_64.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.36-rc3/arch/x86/kernel/entry_64.S
+++ 2.6.36-rc3-x86_64-error_entry-unwind-scope/arch/x86/kernel/entry_64.S
@@ -1445,7 +1445,6 @@ error_swapgs:
error_sti:
TRACE_IRQS_OFF
ret
- CFI_ENDPROC
/*
* There are two places in the kernel that can potentially fault with
@@ -1470,6 +1469,7 @@ bstep_iret:
/* Fix truncated RIP */
movq %rcx,RIP+8(%rsp)
jmp error_swapgs
+ CFI_ENDPROC
END(error_entry)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-03 6:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-30 13:28 [PATCH] x86-64: fix CFI coverage for error_entry() Jan Beulich
2010-06-30 20:04 ` Cyrill Gorcunov
-- strict thread matches above, loose matches on Subject: below --
2010-09-03 6:36 Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox