Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847fa1a6 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

ftrace/x86_32: Set ftrace_stub to weak to prevent gcc from using short jumps to it



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 8329e818, with the same subject as
this commit, but nothing was done for x86_32.

Cc: stable@vger.kernel.org
Fixes: d61f82d0 ("ftrace: use dynamic patching for updating mcount calls")
Reported-by: default avatarColin Ian King <colin.king@canonical.com>
Tested-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 9c1f6bb8
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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)