From a1ef64285ccf300dbd8854cee5a215f33bf5cecb Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 4 Jul 2024 11:34:22 +0200 Subject: [PATCH] 5.15-stable patches added patches: tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch --- queue-5.15/series | 2 +- ...reference-in-perf_trace_qdisc_reset.patch} | 30 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) rename queue-5.15/{tracing-net_sched-null-pointer-dereference-in-perf_t.patch => tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch} (95%) diff --git a/queue-5.15/series b/queue-5.15/series index a58af1e5d8a..0035d598de7 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -277,7 +277,6 @@ sparc-fix-compat-recv-recvfrom-syscalls.patch parisc-use-correct-compat-recv-recvfrom-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 @@ -352,3 +351,4 @@ arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch arm64-dts-rockchip-fix-pmic-interrupt-pin-on-rock-pi.patch arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.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-5.15/tracing-net_sched-null-pointer-dereference-in-perf_t.patch b/queue-5.15/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch similarity index 95% rename from queue-5.15/tracing-net_sched-null-pointer-dereference-in-perf_t.patch rename to queue-5.15/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch index 469eb817be4..e25de29f4a5 100644 --- a/queue-5.15/tracing-net_sched-null-pointer-dereference-in-perf_t.patch +++ b/queue-5.15/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch @@ -1,15 +1,14 @@ -From b71a8290784ee1b486421dc1ed8bd1e14b321533 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 5180da19d837f..fc77362386a5b 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 5180da19d837f..fc77362386a5b 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; -- 2.47.3