Commit a5f05a13 authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Helge Deller
Browse files

parisc/ftrace: Fix function graph tracing disablement 



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: 98f29261 ("parisc/ftrace: use static key to enable/disable function graph tracer")
Cc: stable@vger.kernel.org # 5.16+
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 2d5404ca

arch/parisc/kernel/ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ int ftrace_enable_ftrace_graph_caller(void) 


int ftrace_disable_ftrace_graph_caller(void)

{

	static_key_enable(&ftrace_graph_enable.key);

	static_key_disable(&ftrace_graph_enable.key);

	return 0;

}

#endif