From: Long Li <leo.lilong@huawei.com>
To: "Darrick J. Wong" <djwong@kernel.org>, <yang.yang29@zte.com.cn>
Cc: <linux-xfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<xu.panda@zte.com.cn>
Subject: Re: [PATCH linux-next] xfs: use strscpy() to instead of strncpy()
Date: Sat, 11 Feb 2023 13:06:41 +0800 [thread overview]
Message-ID: <20230211050641.GA2118932@ceph-admin> (raw)
In-Reply-To: <Y9sKXhxvf0DDusih@magnolia>
On Wed, Feb 01, 2023 at 04:57:02PM -0800, Darrick J. Wong wrote:
> On Mon, Jan 09, 2023 at 07:40:43PM +0800, yang.yang29@zte.com.cn wrote:
> > From: Xu Panda <xu.panda@zte.com.cn>
> >
> > The implementation of strscpy() is more robust and safer.
> > That's now the recommended way to copy NUL-terminated strings.
> >
> > Signed-off-by: Xu Panda <xu.panda@zte.com.cn>
> > Signed-off-by: Yang Yang <yang.yang29@zte.com.cn>
>
> Looks fine,
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
>
> --D
>
> > ---
> > 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 10aa1fd39d2b..913c1794bc2f 100644
> > --- a/fs/xfs/xfs_xattr.c
> > +++ b/fs/xfs/xfs_xattr.c
> > @@ -212,9 +212,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 */
The name is not null terminated, it will result slab-out-of-bounds in strscpy().
[1] https://lore.kernel.org/linux-xfs/00000000000065a46a05f4529f59@google.com/T/#u
> >
> > compute_size:
> > context->count += prefix_len + namelen + 1;
> > --
> > 2.15.2
prev parent reply other threads:[~2023-02-11 4:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 11:40 [PATCH linux-next] xfs: use strscpy() to instead of strncpy() yang.yang29
2023-02-02 0:57 ` Darrick J. Wong
2023-02-11 5:06 ` Long Li [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=20230211050641.GA2118932@ceph-admin \
--to=leo.lilong@huawei.com \
--cc=djwong@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=xu.panda@zte.com.cn \
--cc=yang.yang29@zte.com.cn \
/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