Commit 7a2a5f7c authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Jiri Slaby

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

commit 847fa1a6 upstream.

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.

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>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent aaa9f982
...@@ -1113,8 +1113,8 @@ ftrace_graph_call: ...@@ -1113,8 +1113,8 @@ ftrace_graph_call:
jmp ftrace_stub jmp ftrace_stub
#endif #endif
.globl ftrace_stub /* This is weak to keep gas from relaxing the jumps */
ftrace_stub: WEAK(ftrace_stub)
ret ret
END(ftrace_caller) END(ftrace_caller)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment