From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 2/5] xfs: convert a few more directory asserts to corruption returns
Date: Tue, 27 Feb 2018 08:55:46 -0500 [thread overview]
Message-ID: <20180227135545.GC3479@bfoster.bfoster> (raw)
In-Reply-To: <151935119455.21654.14975075500644689016.stgit@magnolia>
On Thu, Feb 22, 2018 at 05:59:54PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Yet another round of playing whack-a-mole with directory code that
> asserts on corrupt on-disk metadata when it really should be returning
> -EFSCORRUPTED instead of ASSERTing. Found by a xfs/391 crash while
> lastbit fuzzing of ltail.bestcount.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/libxfs/xfs_dir2_leaf.c | 3 ++-
> fs/xfs/libxfs/xfs_dir2_node.c | 5 +++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c
> index d7e630f..d61d52d 100644
> --- a/fs/xfs/libxfs/xfs_dir2_leaf.c
> +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
> @@ -1415,7 +1415,8 @@ xfs_dir2_leaf_removename(
> oldbest = be16_to_cpu(bf[0].length);
> ltp = xfs_dir2_leaf_tail_p(args->geo, leaf);
> bestsp = xfs_dir2_leaf_bests_p(ltp);
> - ASSERT(be16_to_cpu(bestsp[db]) == oldbest);
> + if (be16_to_cpu(bestsp[db]) != oldbest)
> + return -EFSCORRUPTED;
> /*
> * Mark the former data entry unused.
> */
> diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c
> index 239d97a..0839ffe 100644
> --- a/fs/xfs/libxfs/xfs_dir2_node.c
> +++ b/fs/xfs/libxfs/xfs_dir2_node.c
> @@ -387,8 +387,9 @@ xfs_dir2_leaf_to_node(
> dp->d_ops->free_hdr_from_disk(&freehdr, free);
> leaf = lbp->b_addr;
> ltp = xfs_dir2_leaf_tail_p(args->geo, leaf);
> - ASSERT(be32_to_cpu(ltp->bestcount) <=
> - (uint)dp->i_d.di_size / args->geo->blksize);
> + if (be32_to_cpu(ltp->bestcount) >
> + (uint)dp->i_d.di_size / args->geo->blksize)
> + return -EFSCORRUPTED;
>
> /*
> * Copy freespace entries from the leaf block to the new block.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-02-27 13:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-23 1:59 [PATCH 0/5] xfs: fix various problems Darrick J. Wong
2018-02-23 1:59 ` [PATCH 1/5] xfs: don't iunlock the quota ip when quota block allocation fails Darrick J. Wong
2018-02-27 13:55 ` Brian Foster
2018-02-23 1:59 ` [PATCH 2/5] xfs: convert a few more directory asserts to corruption returns Darrick J. Wong
2018-02-27 13:55 ` Brian Foster [this message]
2018-02-23 2:00 ` [PATCH 3/5] xfs: check for cow blocks before trying to clear them during inode reclaim Darrick J. Wong
2018-02-27 13:55 ` Brian Foster
2018-02-23 2:00 ` [PATCH 4/5] xfs: convert XFS_AGFL_SIZE to a helper function Darrick J. Wong
2018-02-27 19:34 ` Brian Foster
2018-02-23 2:00 ` [PATCH 5/5] xfs: fix agfl wrapping Darrick J. Wong
2018-02-23 4:40 ` Darrick J. Wong
2018-02-23 20:33 ` Darrick J. Wong
2018-02-27 19:35 ` Brian Foster
2018-02-27 21:03 ` Darrick J. Wong
2018-02-28 22:43 ` Brian Foster
2018-02-28 23:20 ` Darrick J. Wong
2018-03-01 17:28 ` Brian Foster
2018-03-01 20:55 ` Darrick J. Wong
2018-03-02 13:12 ` Brian Foster
2018-03-03 13:59 ` Brian Foster
2018-03-05 22:24 ` Darrick J. Wong
2018-03-05 22:53 ` Dave Chinner
2018-03-06 2:15 ` Darrick J. Wong
2018-03-06 12:02 ` Brian Foster
2018-03-01 6:37 ` Darrick J. Wong
2018-03-01 6:42 ` [PATCH v2 " Darrick J. Wong
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=20180227135545.GC3479@bfoster.bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).