[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4bc8b342-1390-4247-86e1-9a6d55f8ff93@gmail.com>
Date: Wed, 3 Jul 2024 03:36:13 +0900
From: Yunseong Kim <yskelg@...il.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, stable@...r.kernel.org
Cc: patches@...ts.linux.dev, netdev@...r.kernel.org,
Yeoreum Yun <yeoreum.yun@....com>, Paolo Abeni <pabeni@...hat.com>,
Sasha Levin <sashal@...nel.org>
Subject: Re: [PATCH 6.1 035/128] tracing/net_sched: NULL pointer dereference
in perf_trace_qdisc_reset()
Hi Greg,
On 7/3/24 2:03 오전, Greg Kroah-Hartman wrote:
> 6.1-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Yunseong Kim <yskelg@...il.com>
>
> [ Upstream commit bab4923132feb3e439ae45962979c5d9d5c7c1f1 ]
>
> Fixes: 51270d573a8d ("tracing/net_sched: Fix tracepoints that save qdisc_dev() as a string")
> Link: https://lore.kernel.org/lkml/20240229143432.273b4871@gandalf.local.home/t/
> Cc: netdev@...r.kernel.org
> Tested-by: Yunseong Kim <yskelg@...il.com>
> Signed-off-by: Yunseong Kim <yskelg@...il.com>
> Signed-off-by: Yeoreum Yun <yeoreum.yun@....com>
> Link: https://lore.kernel.org/r/20240624173320.24945-4-yskelg@gmail.com
> Signed-off-by: Paolo Abeni <pabeni@...hat.com>
> Signed-off-by: Sasha Levin <sashal@...nel.org>
> ---
> include/trace/events/qdisc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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,
> TP_ARGS(q),
>
> TP_STRUCT__entry(
> - __string( dev, qdisc_dev(q)->name )
> + __string( dev, qdisc_dev(q) ? qdisc_dev(q)->name : "(null)" )
> __string( kind, q->ops->id )
> __field( u32, parent )
> __field( u32, handle )
Since that code changed in 6.10 and the stable is in an intermediate
state, I had to fix some other things as well.
So, I submit another patch. Please check out.
Link:
https://lore.kernel.org/stable/20240702180146.5126-2-yskelg@gmail.com/T/#u
Warm regards,
Yunseong Kim
Powered by blists - more mailing lists