5.4-stable patches

added patches:
	revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch

diff --git a/queue-5.4/revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch b/queue-5.4/revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch
new file mode 100644 (file)
index 0000000..6fe2d0b
--- /dev/null
+++ b/queue-5.4/revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch
@@ -0,0 +1,53 @@
+From siddh.raman.pant@oracle.com  Fri Apr 19 13:11:23 2024
+From: Siddh Raman Pant <siddh.raman.pant@oracle.com>
+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@linuxfoundation.org>, Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@redhat.com>
+Cc: linux-trace-kernel <linux-trace-kernel@vger.kernel.org>, linux-kernel <linux-kernel@vger.kernel.org>, stable@kernel.org
+Message-ID: <20240418132806.159307-1-siddh.raman.pant@oracle.com>
+
+From: Siddh Raman Pant <siddh.raman.pant@oracle.com>
+
+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@kernel.org # 5.15, 5.10, 5.4, 4.19
+Signed-off-by: Siddh Raman Pant <siddh.raman.pant@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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);
+ }

diff --git a/queue-5.4/series b/queue-5.4/series
index a4e13a380c7cf6632a8ac41594188a1871201562..f612c8e6d8867ca56eeb7e452bd3e9f1f591c1a6 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -20,3 +20,4 @@ btrfs-record-delayed-inode-root-in-transaction.patch
 ring-buffer-only-update-pages_touched-when-a-new-pag.patch
 selftests-ftrace-limit-length-in-subsystem-enable-tests.patch
 kprobes-fix-possible-use-after-free-issue-on-kprobe-registration.patch
+revert-tracing-trigger-fix-to-return-error-if-failed-to-alloc-snapshot.patch