Skip to content

Commit 2eddcea

Browse files
jpoimboeSasha Levin
authored and
Sasha Levin
committed
parisc/ftrace: Fix function graph tracing disablement
commit a5f05a1 upstream. Due to an apparent copy-paste bug, the parisc implementation of ftrace_disable_ftrace_graph_caller() doesn't actually do anything. It enables the (already-enabled) static key rather than disabling it. The result is that after function graph tracing has been "disabled", any subsequent (non-graph) function tracing will inadvertently also enable the slow fgraph return address hijacking. Fixes: 98f2926 ("parisc/ftrace: use static key to enable/disable function graph tracer") Cc: stable@vger.kernel.org # 5.16+ Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e3cf253 commit 2eddcea

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/parisc/kernel/ftrace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ int ftrace_enable_ftrace_graph_caller(void)
8787

8888
int ftrace_disable_ftrace_graph_caller(void)
8989
{
90-
static_key_enable(&ftrace_graph_enable.key);
90+
static_key_disable(&ftrace_graph_enable.key);
9191
return 0;
9292
}
9393
#endif

0 commit comments

Comments
 (0)