From: David Laight <david.laight.linux@gmail.com>
To: Ajith P V <ajithpv.linux@gmail.com>
Cc: tung.quang.nguyen@est.tech, jmaloy@redhat.com,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, horms@kernel.org, netdev@vger.kernel.org,
tipc-discussion@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH net-next v5] tipc: replace deprecated strcpy with strscpy in tipc_bearer_get_name()
Date: Wed, 9 Sep 2026 09:43:56 +0100 [thread overview]
Message-ID: <20260909094356.00a640dd@pumpkin> (raw)
In-Reply-To: <20260903132718.1616159-1-ajithpv.linux@gmail.com>
On Thu, 3 Sep 2026 13:27:18 +0000
Ajith P V <ajithpv.linux@gmail.com> wrote:
> The `strcpy()` function is deprecated and moving towards code-tree
> elimination. Replacing it with `strscpy()` fixes potential buffer
> overflow vectors by ensuring safe NULL-termination based on the
> destination buffer size limit [1][2].
>
> To make the interface safer and more robust for future callers, refactor
> `tipc_bearer_get_name()` to accept a destination buffer length parameter.
> Replace `strcpy()` with `strscpy()` and pass through any potential
> `-E2BIG` truncation error code up to the caller. Update the existing
> caller in `net/tipc/monitor.c` to pass its array size.
>
> Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strcpy [1]
> Link: https://github.com/KSPP/linux/issues/88 [2]
>
> Signed-off-by: Ajith P V <ajithpv.linux@gmail.com>
> ---
> v5:
> - Cleaned up implementation by removing extra `ret` variable as suggested.
> - Wrapped long lines to fix checkpatch column-limit warning.
> v4:
> - Avoid hard-coding TIPC_MAX_BEARER_NAME in the function body.
> - Pass size_t len from the caller down to strscpy().
> - Forward strscpy()'s -E2BIG error up through the existing int return type.
> - Updated function documentation comment block.
> v3:
> - Fix patch title as suggested by Tung Quang Nguyen.
> - No code changes from v2.
> v2:
> - Target net-next tree instead of standard net tree as requested by Tung Quang Nguyen.
> - No code changes from v1.
>
> net/tipc/bearer.c | 6 ++++--
> net/tipc/bearer.h | 3 ++-
> net/tipc/monitor.c | 3 ++-
> 3 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
> index 05dcd2f9e887..65fa18928fe3 100644
> --- a/net/tipc/bearer.c
> +++ b/net/tipc/bearer.c
> @@ -195,9 +195,10 @@ struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name)
> /* tipc_bearer_get_name - get the bearer name from its id.
> * @net: network namespace
> * @name: a pointer to the buffer where the name will be stored.
> + * @len: size of the destination buffer
> * @bearer_id: the id to get the name from.
> */
> -int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id)
> +int tipc_bearer_get_name(struct net *net, char *name, size_t len, u32 bearer_id)
> {
> struct tipc_net *tn = tipc_net(net);
> struct tipc_bearer *b;
> @@ -209,7 +210,8 @@ int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id)
> if (!b)
> return -EINVAL;
>
> - strcpy(name, b->name);
> + if (strscpy(name, b->name, len) < 0)
> + return -E2BIG;
> return 0;
> }
>
> diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
> index 41eac1ee0c09..9ccc9ffa925a 100644
> --- a/net/tipc/bearer.h
> +++ b/net/tipc/bearer.h
> @@ -226,7 +226,8 @@ int tipc_l2_send_msg(struct net *net, struct sk_buff *buf,
> void tipc_bearer_add_dest(struct net *net, u32 bearer_id, u32 dest);
> void tipc_bearer_remove_dest(struct net *net, u32 bearer_id, u32 dest);
> struct tipc_bearer *tipc_bearer_find(struct net *net, const char *name);
> -int tipc_bearer_get_name(struct net *net, char *name, u32 bearer_id);
> +int tipc_bearer_get_name(struct net *net, char *name,
> + size_t len, u32 bearer_id);
> struct tipc_media *tipc_media_find(const char *name);
> int tipc_bearer_setup(void);
> void tipc_bearer_cleanup(void);
> diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c
> index a94b9b36a700..a8a088fc2a2c 100644
> --- a/net/tipc/monitor.c
> +++ b/net/tipc/monitor.c
> @@ -829,11 +829,12 @@ int __tipc_nl_add_monitor(struct net *net, struct tipc_nl_msg *msg,
> {
> struct tipc_monitor *mon = tipc_monitor(net, bearer_id);
> char bearer_name[TIPC_MAX_BEARER_NAME];
> + size_t name_len = sizeof(bearer_name);
> struct nlattr *attrs;
> void *hdr;
> int ret;
>
> - ret = tipc_bearer_get_name(net, bearer_name, bearer_id);
> + ret = tipc_bearer_get_name(net, bearer_name, name_len, bearer_id);
There really is no point in the name_len variable.
> if (ret || !mon)
> return 0;
>
prev parent reply other threads:[~2026-09-09 8:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-03 13:27 Ajith P V
2026-09-09 0:07 ` Jakub Kicinski
2026-09-09 8:43 ` David Laight [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260909094356.00a640dd@pumpkin \
--to=david.laight.linux@gmail.com \
--cc=ajithpv.linux@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jmaloy@redhat.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=tipc-discussion@lists.sourceforge.net \
--cc=tung.quang.nguyen@est.tech \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®