This is a note to let you know that I've just added the patch titled
Revert "tracing/trigger: Fix to return error if failed to alloc snapshot"
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From siddh.raman.pant@xxxxxxxxxx Fri Apr 19 13:11:23 2024
From: Siddh Raman Pant <siddh.raman.pant@xxxxxxxxxx>
Date: Thu, 18 Apr 2024 18:58:06 +0530
Subject: Revert "tracing/trigger: Fix to return error if failed to alloc snapshot"
To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Steven Rostedt <rostedt@xxxxxxxxxxx>, Ingo Molnar <mingo@xxxxxxxxxx>
Cc: linux-trace-kernel <linux-trace-kernel@xxxxxxxxxxxxxxx>, linux-kernel <linux-kernel@xxxxxxxxxxxxxxx>, stable@xxxxxxxxxx
Message-ID: <20240418132806.159307-1-siddh.raman.pant@xxxxxxxxxx>
From: Siddh Raman Pant <siddh.raman.pant@xxxxxxxxxx>
This reverts commit 8ffd5590f4d6ef5460acbeac7fbdff7025f9b419 which is
commit 0958b33ef5a04ed91f61cef4760ac412080c4e08 upstream.
The change has an incorrect assumption about the return value because
in the current stable trees for versions 5.15 and before, the following
commit responsible for making 0 a success value is not present:
b8cc44a4d3c1 ("tracing: Remove logic for registering multiple event triggers at a time")
The return value should be 0 on failure in the current tree, because in
the functions event_trigger_callback() and event_enable_trigger_func(),
we have:
ret = cmd_ops->reg(glob, trigger_ops, trigger_data, file);
/*
* The above returns on success the # of functions enabled,
* but if it didn't find any functions it returns zero.
* Consider no functions a failure too.
*/
if (!ret) {
ret = -ENOENT;
Cc: stable@xxxxxxxxxx # 5.15, 5.10, 5.4, 4.19
Signed-off-by: Siddh Raman Pant <siddh.raman.pant@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
kernel/trace/trace_events_trigger.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -1140,10 +1140,8 @@ register_snapshot_trigger(char *glob, st
struct event_trigger_data *data,
struct trace_event_file *file)
{
- int ret = tracing_alloc_snapshot_instance(file->tr);
-
- if (ret < 0)
- return ret;
+ if (tracing_alloc_snapshot_instance(file->tr) != 0)
+ return 0;
return register_trigger(glob, ops, data, file);
}
Patches currently in stable-queue which might be from siddh.raman.pant@xxxxxxxxxx are
queue-5.4/revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch
