From: "Darrick J. Wong" <djwong@kernel.org>
To: Thorsten Blum <thorsten.blum@linux.dev>
Cc: Carlos Maiolino <cem@kernel.org>,
linux-hardening@vger.kernel.org, linux-xfs@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] xfs: Replace deprecated strncpy() with strscpy()
Date: Tue, 4 Mar 2025 18:21:53 -0800 [thread overview]
Message-ID: <20250305022153.GC2803771@frogsfrogsfrogs> (raw)
In-Reply-To: <20250305011020.160220-2-thorsten.blum@linux.dev>
On Wed, Mar 05, 2025 at 02:10:21AM +0100, Thorsten Blum wrote:
> strncpy() is deprecated for NUL-terminated destination buffers. Use
> strscpy() instead and remove the manual NUL-termination.
>
> No functional changes intended.
>
> Link: https://github.com/KSPP/linux/issues/90
> Cc: linux-hardening@vger.kernel.org
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
> fs/xfs/xfs_xattr.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c
> index 0f641a9091ec..9f9a866ab803 100644
> --- a/fs/xfs/xfs_xattr.c
> +++ b/fs/xfs/xfs_xattr.c
> @@ -243,9 +243,7 @@ __xfs_xattr_put_listent(
> offset = context->buffer + context->count;
> memcpy(offset, prefix, prefix_len);
> offset += prefix_len;
> - strncpy(offset, (char *)name, namelen); /* real name */
> - offset += namelen;
> - *offset = '\0';
> + strscpy(offset, (char *)name, namelen + 1); /* real name */
Please read the list archives before you post:
https://lore.kernel.org/linux-xfs/20230211050641.GA2118932@ceph-admin/
If anything, memcpy() would be appropriate here.
--D
>
> compute_size:
> context->count += prefix_len + namelen + 1;
> --
> 2.48.1
>
next prev parent reply other threads:[~2025-03-05 2:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-05 1:10 [PATCH] xfs: Replace deprecated strncpy() with strscpy() Thorsten Blum
2025-03-05 2:21 ` Darrick J. Wong [this message]
2025-03-05 2:59 ` Thorsten Blum
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=20250305022153.GC2803771@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=thorsten.blum@linux.dev \
/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