diff options
| author | Josh Poimboeuf <jpoimboe@kernel.org> | 2024-10-02 23:32:04 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2024-11-16 22:55:56 +0100 |
| commit | a5f05a138a8cac035bf9da9b6ed0e532bc7942c8 (patch) | |
| tree | 9fd51ce2db0b3e6b559917f1b7ea6e122b691b73 | |
| parent | Linux 6.12-rc7 (diff) | |
| download | linux-a5f05a138a8cac035bf9da9b6ed0e532bc7942c8.tar.xz linux-a5f05a138a8cac035bf9da9b6ed0e532bc7942c8.zip | |
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: 98f2926171ae ("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>
| -rw-r--r-- | arch/parisc/kernel/ftrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c index c91f9c2e61ed..f8d08eab7db8 100644 --- a/arch/parisc/kernel/ftrace.c +++ b/arch/parisc/kernel/ftrace.c @@ -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 |