From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Brian Foster <bfoster@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 3/4] xfs: namecheck directory entry names before listing them
Date: Mon, 28 Oct 2019 11:23:16 -0700 [thread overview]
Message-ID: <20191028182316.GX15222@magnolia> (raw)
In-Reply-To: <20191028181915.GD26529@bfoster>
On Mon, Oct 28, 2019 at 02:19:15PM -0400, Brian Foster wrote:
> On Thu, Oct 24, 2019 at 10:15:05PM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> >
> > Actually call namecheck on directory entry names before we hand them
> > over to userspace.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> > fs/xfs/xfs_dir2_readdir.c | 16 ++++++++++++++++
> > 1 file changed, 16 insertions(+)
> >
> >
> > diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
> > index 283df898dd9f..a8fb0a6829fd 100644
> > --- a/fs/xfs/xfs_dir2_readdir.c
> > +++ b/fs/xfs/xfs_dir2_readdir.c
> ...
> > @@ -208,6 +214,11 @@ xfs_dir2_block_getdents(
> > /*
> > * If it didn't fit, set the final offset to here & return.
> > */
> > + if (!xfs_dir2_namecheck(dep->name, dep->namelen)) {
> > + XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW,
> > + dp->i_mount);
> > + return -EFSCORRUPTED;
> > + }
>
> xfs_trans_brelse(..., bp) (here and in _leaf_getdents())?
Will fix.
--D
> Brian
>
> > if (!dir_emit(ctx, (char *)dep->name, dep->namelen,
> > be64_to_cpu(dep->inumber),
> > xfs_dir3_get_dtype(dp->i_mount, filetype))) {
> > @@ -456,6 +467,11 @@ xfs_dir2_leaf_getdents(
> > filetype = dp->d_ops->data_get_ftype(dep);
> >
> > ctx->pos = xfs_dir2_byte_to_dataptr(curoff) & 0x7fffffff;
> > + if (!xfs_dir2_namecheck(dep->name, dep->namelen)) {
> > + XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW,
> > + dp->i_mount);
> > + return -EFSCORRUPTED;
> > + }
> > if (!dir_emit(ctx, (char *)dep->name, dep->namelen,
> > be64_to_cpu(dep->inumber),
> > xfs_dir3_get_dtype(dp->i_mount, filetype)))
> >
>
next prev parent reply other threads:[~2019-10-28 18:24 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 5:14 [PATCH 0/4] xfs: more metadata verifier tightening Darrick J. Wong
2019-10-25 5:14 ` [PATCH 1/4] xfs: check attribute leaf block structure Darrick J. Wong
2019-10-28 18:18 ` Brian Foster
2019-10-28 18:27 ` Darrick J. Wong
2019-10-25 5:14 ` [PATCH 2/4] xfs: namecheck attribute names before listing them Darrick J. Wong
2019-10-28 18:18 ` Brian Foster
2019-10-28 18:22 ` Darrick J. Wong
2019-10-25 5:15 ` [PATCH 3/4] xfs: namecheck directory entry " Darrick J. Wong
2019-10-25 12:56 ` Christoph Hellwig
2019-10-25 16:04 ` Darrick J. Wong
2019-10-29 7:16 ` Christoph Hellwig
2019-10-29 16:23 ` Darrick J. Wong
2019-10-30 21:32 ` Christoph Hellwig
2019-10-30 22:18 ` Darrick J. Wong
2019-10-28 18:19 ` Brian Foster
2019-10-28 18:23 ` Darrick J. Wong [this message]
2019-10-25 5:15 ` [PATCH 4/4] xfs: replace -EIO with -EFSCORRUPTED for corrupt metadata Darrick J. Wong
2019-10-25 12:54 ` Christoph Hellwig
2019-10-28 18:19 ` Brian Foster
2019-10-29 4:03 [PATCH v2 0/4] xfs: more metadata verifier tightening Darrick J. Wong
2019-10-29 4:04 ` [PATCH 3/4] xfs: namecheck directory entry names before listing them Darrick J. Wong
2019-10-29 10:04 ` Brian Foster
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=20191028182316.GX15222@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--cc=linux-xfs@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.