From: Greg Kroah-Hartman Date: Thu, 4 Jul 2024 09:34:10 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v4.19.317~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc336d590c18d750230eac2c80760649b33d78b0;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch --- diff --git a/queue-5.10/series b/queue-5.10/series index 52967d24bd0..1b024461f3a 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -220,7 +220,6 @@ sparc-fix-old-compat_sys_select.patch sparc-fix-compat-recv-recvfrom-syscalls.patch parisc-use-correct-compat-recv-recvfrom-syscalls.patch netfilter-nf_tables-fully-validate-nft_data_value-on.patch -tracing-net_sched-null-pointer-dereference-in-perf_t.patch drm-panel-ilitek-ili9881c-fix-warning-with-gpio-cont.patch mtd-partitions-redboot-added-conversion-of-operands-.patch bpf-add-a-check-for-struct-bpf_fib_lookup-size.patch @@ -282,3 +281,4 @@ arm-dts-rockchip-rk3066a-add-sound-dai-cells-to-hdmi.patch arm64-dts-rockchip-add-sound-dai-cells-for-rk3368.patch xdp-xdp_mem_allocator-can-be-null-in-trace_mem_connect.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.10/tracing-net_sched-null-pointer-dereference-in-perf_t.patch b/queue-5.10/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch similarity index 95% rename from queue-5.10/tracing-net_sched-null-pointer-dereference-in-perf_t.patch rename to queue-5.10/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch index 77dd2a27913..5c48d8dc6ee 100644 --- a/queue-5.10/tracing-net_sched-null-pointer-dereference-in-perf_t.patch +++ b/queue-5.10/tracing-net_sched-null-pointer-dereference-in-perf_trace_qdisc_reset.patch @@ -1,15 +1,14 @@ -From 54fd514a55ab92b28e457ea6557584719cfb1467 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 a50df41634c58..f661d3d7c410a 100644 --- a/include/trace/events/qdisc.h +++ b/include/trace/events/qdisc.h -@@ -53,7 +53,7 @@ TRACE_EVENT(qdisc_reset, +@@ -78,14 +78,14 @@ TRACE_EVENT(qdisc_destroy, TP_ARGS(q), TP_STRUCT__entry( @@ -301,6 +298,11 @@ index a50df41634c58..f661d3d7c410a 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;