6.1-stable patches

added patches:
	tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch

diff --git a/queue-6.1/series b/queue-6.1/series
index 93f9eb822dcaaa19c43b91b7f6806a5695300bc8..ce31fc8956e6f627c4ec79f7aeecd6d939ae3c5d 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -31,7 +31,6 @@ parisc-use-correct-compat-recv-recvfrom-syscalls.patch
 powerpc-restore-some-missing-spu-syscalls.patch
 tcp-fix-tcp_rcv_fastopen_synack-to-enter-tcp_ca_loss.patch
 netfilter-nf_tables-fully-validate-nft_data_value-on.patch
-tracing-net_sched-null-pointer-dereference-in-perf_t.patch
 bpf-take-return-from-set_memory_ro-into-account-with.patch
 drm-panel-ilitek-ili9881c-fix-warning-with-gpio-cont.patch
 vduse-validate-block-features-only-with-block-device.patch
@@ -127,3 +126,4 @@ arm64-dts-rockchip-fix-pmic-interrupt-pin-on-rock-pi.patch
 arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch
 serial-imx-only-set-receiver-level-if-it-is-zero.patch
 serial-8250_omap-fix-errata-i2310-with-rx-fifo-level-check.patch
+tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch

diff --git a/queue-6.1/tracing-net_sched-null-pointer-dereference-in-perf_t.patch b/queue-6.1/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch
similarity index 95%
rename from queue-6.1/tracing-net_sched-null-pointer-dereference-in-perf_t.patch
rename to queue-6.1/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch
index 6db40993f92d66beae88874586045bc4b4cf6968..e25de29f4a511ce3d595100716933cdda68b7cf3 100644 (file)
--- a/queue-6.1/tracing-net_sched-null-pointer-dereference-in-perf_t.patch
+++ b/queue-6.1/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch
@@ -1,15 +1,14 @@
-From 98aa00e407702acdde8aad81051c597a4dcbffec Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
+From bab4923132feb3e439ae45962979c5d9d5c7c1f1 Mon Sep 17 00:00:00 2001
+From: Yunseong Kim <yskelg@gmail.com>
 Date: Tue, 25 Jun 2024 02:33:23 +0900
-Subject: tracing/net_sched: NULL pointer dereference in
- perf_trace_qdisc_reset()
+Subject: tracing/net_sched: NULL pointer dereference in perf_trace_qdisc_reset()
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 From: Yunseong Kim <yskelg@gmail.com>
 
-[ Upstream commit bab4923132feb3e439ae45962979c5d9d5c7c1f1 ]
+commit bab4923132feb3e439ae45962979c5d9d5c7c1f1 upstream.
 
 In the TRACE_EVENT(qdisc_reset) NULL dereference occurred from
 
@@ -283,16 +282,14 @@ Signed-off-by: Yunseong Kim <yskelg@gmail.com>
 Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
 Link: https://lore.kernel.org/r/20240624173320.24945-4-yskelg@gmail.com
 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- include/trace/events/qdisc.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ include/trace/events/qdisc.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/include/trace/events/qdisc.h b/include/trace/events/qdisc.h
-index 1f4258308b967..69453b8de29e6 100644
 --- a/include/trace/events/qdisc.h
 +++ b/include/trace/events/qdisc.h
-@@ -81,7 +81,7 @@ TRACE_EVENT(qdisc_reset,
+@@ -81,14 +81,14 @@ TRACE_EVENT(qdisc_reset,
        TP_ARGS(q),
  
        TP_STRUCT__entry(
@@ -301,6 +298,11 @@ index 1f4258308b967..69453b8de29e6 100644
                __string(       kind,           q->ops->id              )
                __field(        u32,            parent                  )
                __field(        u32,            handle                  )
--- 
-2.43.0
-
+       ),
+ 
+       TP_fast_assign(
+-              __assign_str(dev, qdisc_dev(q)->name);
++              __assign_str(dev, qdisc_dev(q) ? qdisc_dev(q)->name : "(null)");
+               __assign_str(kind, q->ops->id);
+               __entry->parent = q->parent;
+               __entry->handle = q->handle;