From: Greg Kroah-Hartman Date: Thu, 4 Jul 2024 09:34:57 +0000 (+0200) Subject: 6.9-stable patches X-Git-Tag: v4.19.317~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33b0d6bd9e1b5b39b4bdcca136cccbcce39c6413;p=thirdparty%2Fkernel%2Fstable-queue.git 6.9-stable patches added patches: tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch --- diff --git a/queue-6.9/series b/queue-6.9/series index a8635c7ee6a..a9e4a5ba479 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -56,7 +56,6 @@ ionic-use-dev_consume_skb_any-outside-of-napi.patch tcp-fix-tcp_rcv_fastopen_synack-to-enter-tcp_ca_loss.patch alsa-seq-fix-missing-msb-in-midi2-spp-conversion.patch netfilter-nf_tables-fully-validate-nft_data_value-on.patch -tracing-net_sched-null-pointer-dereference-in-perf_t.patch af_unix-stop-recv-msg_peek-at-consumed-oob-skb.patch af_unix-don-t-stop-recv-msg_dontwait-if-consumed-oob.patch af_unix-don-t-stop-recv-at-consumed-ex-oob-skb.patch @@ -222,3 +221,4 @@ netfs-fix-netfs_page_mkwrite-to-check-folio-mapping-.patch netfs-fix-netfs_page_mkwrite-to-flush-conflicting-da.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.9/tracing-net_sched-null-pointer-dereference-in-perf_t.patch b/queue-6.9/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch similarity index 95% rename from queue-6.9/tracing-net_sched-null-pointer-dereference-in-perf_t.patch rename to queue-6.9/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch index 0d52c15e771..e25de29f4a5 100644 --- a/queue-6.9/tracing-net_sched-null-pointer-dereference-in-perf_t.patch +++ b/queue-6.9/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch @@ -1,15 +1,14 @@ -From 9c2f5cc153e7878ce3b8bca9aad669cad550d727 Mon Sep 17 00:00:00 2001 -From: Sasha Levin +From bab4923132feb3e439ae45962979c5d9d5c7c1f1 Mon Sep 17 00:00:00 2001 +From: Yunseong Kim 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 -[ 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 Signed-off-by: Yeoreum Yun Link: https://lore.kernel.org/r/20240624173320.24945-4-yskelg@gmail.com Signed-off-by: Paolo Abeni -Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - 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;