[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <aHTtCGGlrvOZvnsW@debian>
Date: Mon, 14 Jul 2025 13:42:00 +0200
From: Guillaume Nault <gnault@...hat.com>
To: Thorsten Blum <thorsten.blum@...ux.dev>
Cc: Steven Rostedt <rostedt@...dmis.org>,
Masami Hiramatsu <mhiramat@...nel.org>,
Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
Paolo Abeni <pabeni@...hat.com>, Ido Schimmel <idosch@...dia.com>,
Petr Machata <petrm@...dia.com>, linux-kernel@...r.kernel.org,
linux-trace-kernel@...r.kernel.org
Subject: Re: [PATCH net-next] tracing: ipv6: Replace deprecated strcpy() with
strscpy()
On Mon, Jul 14, 2025 at 09:54:33AM +0200, Thorsten Blum wrote:
> strcpy() is deprecated; use strscpy() instead.
>
> Since the destination buffer has a fixed length, strscpy() automatically
> determines its size using sizeof() when the size argument is omitted.
> This makes the explicit size argument unnecessary - remove it.
>
> Now, combine both if-else branches using strscpy() and the same buffer
> into a single statement to simplify the code.
>
> No functional changes intended.
>
> Link: https://github.com/KSPP/linux/issues/88
> Signed-off-by: Thorsten Blum <thorsten.blum@...ux.dev>
> ---
> include/trace/events/fib6.h | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/include/trace/events/fib6.h b/include/trace/events/fib6.h
> index 8d22b2e98d48..903a18836bc6 100644
> --- a/include/trace/events/fib6.h
> +++ b/include/trace/events/fib6.h
> @@ -64,11 +64,9 @@ TRACE_EVENT(fib6_table_lookup,
> __entry->dport = 0;
> }
>
> - if (res->nh && res->nh->fib_nh_dev) {
> - strscpy(__entry->name, res->nh->fib_nh_dev->name, IFNAMSIZ);
> - } else {
> - strcpy(__entry->name, "-");
> - }
> + strscpy(__entry->name, res->nh && res->nh->fib_nh_dev ?
> + res->nh->fib_nh_dev->name : "-");
> +
Acked-by: Guillaume Nault <gnault@...hat.com>
Powered by blists - more mailing lists