diff mbox

[SRU,XENIAL,YAKKETY,ZESTY] ftrace/x86_32: Set ftrace_stub to weak to prevent gcc from using short jumps to it

Message ID 20170109143429.28972-1-colin.king@canonical.com
State New
Headers show

Commit Message

Colin Ian King Jan. 9, 2017, 2:34 p.m. UTC 
From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>

BugLink: http://bugs.launchpad.net/bugs/1655040

With new binutils, gcc may get smart with its optimization and change a jmp
from a 5 byte jump to a 2 byte one even though it was jumping to a global
function. But that global function existed within a 2 byte radius, and gcc
was able to optimize it. Unfortunately, that jump was also being modified
when function graph tracing begins. Since ftrace expected that jump to be 5
bytes, but it was only two, it overwrote code after the jump, causing a
crash.

This was fixed for x86_64 with commit 8329e818f149, with the same subject as
this commit, but nothing was done for x86_32.

Cc: stable@vger.kernel.org
Fixes: d61f82d06672 ("ftrace: use dynamic patching for updating mcount calls")
Reported-by: Colin Ian King <colin.king@canonical.com>
Tested-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
(cherry picked from commit 847fa1a6d3d00f3bdf68ef5fa4a786f644a0dd67)
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arch/x86/entry/entry_32.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Tim Gardner Jan. 9, 2017, 3:30 p.m. UTC | #1
Luis Henriques Jan. 9, 2017, 4:26 p.m. UTC | #2 
Applied to xenial and yakkety master-next branches.

Cheers,
--
Luís
diff mbox

Patch

diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
index 21b352a..edba860 100644
--- a/arch/x86/entry/entry_32.S
+++ b/arch/x86/entry/entry_32.S
@@ -889,8 +889,8 @@  ftrace_graph_call:
 	jmp	ftrace_stub
 #endif
 
-.globl ftrace_stub
-ftrace_stub:
+/* This is weak to keep gas from relaxing the jumps */
+WEAK(ftrace_stub)
 	ret
 END(ftrace_caller)