diff options
| author | Josh Poimboeuf <jpoimboe@kernel.org> | 2024-10-02 14:32:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-09 10:32:48 +0100 |
| commit | 9665bbefab87d92840df3ae96a90f4e1bbe8efe8 (patch) | |
| tree | 8209027208fb1fd39afc134f8fa6ac7fa675dd2c /arch/parisc | |
| parent | 185f065f458b79df8d52e8fbe5a4595f73c1b74f (diff) | |
| download | linux-9665bbefab87d92840df3ae96a90f4e1bbe8efe8.tar.gz linux-9665bbefab87d92840df3ae96a90f4e1bbe8efe8.tar.bz2 linux-9665bbefab87d92840df3ae96a90f4e1bbe8efe8.zip | |
parisc/ftrace: Fix function graph tracing disablement
commit a5f05a138a8cac035bf9da9b6ed0e532bc7942c8 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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/parisc')
| -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 |