From: Allison Henderson <allison.henderson@oracle.com>
To: "horms@kernel.org" <horms@kernel.org>,
"edumazet@google.com" <edumazet@google.com>,
"davem@davemloft.net" <davem@davemloft.net>,
"goralbaris@gmail.com" <goralbaris@gmail.com>,
"kuba@kernel.org" <kuba@kernel.org>
Cc: "michal.swiatkowski@linux.intel.com"
<michal.swiatkowski@linux.intel.com>,
"shankari.ak0208@gmail.com" <shankari.ak0208@gmail.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-rdma@vger.kernel.org" <linux-rdma@vger.kernel.org>,
"pabeni@redhat.com" <pabeni@redhat.com>,
"skhan@linuxfoundation.org" <skhan@linuxfoundation.org>
Subject: Re: [PATCH v5 net-next: rds] replace strncpy with strscpy_pad
Date: Wed, 21 May 2025 17:14:57 +0000 [thread overview]
Message-ID: <dac05a17837275f8224ae3d7bb11f41ed0400682.camel@oracle.com> (raw)
In-Reply-To: <20250521161036.14489-1-goralbaris@gmail.com>
On Wed, 2025-05-21 at 19:10 +0300, Baris Can Goral wrote:
> The strncpy() function is actively dangerous to use since it may not
> NULL-terminate the destination string, resulting in potential memory
> content exposures, unbounded reads, or crashes.
> Link: https://urldefense.com/v3/__https://github.com/KSPP/linux/issues/90__;!!ACWV5N9M2RV99hQ!PnLUmB9dUMUGdB0dDAEBM6IyoQVEtGLUn755qxSKNTBnGdMzPyDN0cDAS8qijzYFKXnMu3ApLnN0Jc3YBBfCtzh9$
>
> In addition, strscpy_pad is more appropriate because it also zero-fills
> any remaining space in the destination if the source is shorter than
> the provided buffer size.
>
> Signed-off-by: Baris Can Goral <goralbaris@gmail.com>
Thanks for the updates, I think this version looks correct now.
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
> ---
> net/rds/connection.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/net/rds/connection.c b/net/rds/connection.c
> index c749c5525b40..d62f486ab29f 100644
> --- a/net/rds/connection.c
> +++ b/net/rds/connection.c
> @@ -749,8 +749,7 @@ static int rds_conn_info_visitor(struct rds_conn_path *cp, void *buffer)
> cinfo->laddr = conn->c_laddr.s6_addr32[3];
> cinfo->faddr = conn->c_faddr.s6_addr32[3];
> cinfo->tos = conn->c_tos;
> - strncpy(cinfo->transport, conn->c_trans->t_name,
> - sizeof(cinfo->transport));
> + strscpy_pad(cinfo->transport, conn->c_trans->t_name);
> cinfo->flags = 0;
>
> rds_conn_info_set(cinfo->flags, test_bit(RDS_IN_XMIT, &cp->cp_flags),
> @@ -775,8 +774,7 @@ static int rds6_conn_info_visitor(struct rds_conn_path *cp, void *buffer)
> cinfo6->next_rx_seq = cp->cp_next_rx_seq;
> cinfo6->laddr = conn->c_laddr;
> cinfo6->faddr = conn->c_faddr;
> - strncpy(cinfo6->transport, conn->c_trans->t_name,
> - sizeof(cinfo6->transport));
> + strscpy_pad(cinfo6->transport, conn->c_trans->t_name);
> cinfo6->flags = 0;
>
> rds_conn_info_set(cinfo6->flags, test_bit(RDS_IN_XMIT, &cp->cp_flags),
next prev parent reply other threads:[~2025-05-21 17:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-21 16:10 [PATCH v5 net-next: rds] replace strncpy with strscpy_pad Baris Can Goral
2025-05-21 17:14 ` Allison Henderson [this message]
2025-05-26 20:40 ` patchwork-bot+netdevbpf
-- strict thread matches above, loose matches on Subject: below --
2025-05-19 21:15 [PATCH v4 " Allison Henderson
2025-05-20 16:23 ` [PATCH v5 " Baris Can Goral
2025-05-20 21:13 ` Zhu Yanjun
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=dac05a17837275f8224ae3d7bb11f41ed0400682.camel@oracle.com \
--to=allison.henderson@oracle.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=goralbaris@gmail.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=michal.swiatkowski@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shankari.ak0208@gmail.com \
--cc=skhan@linuxfoundation.org \
/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