From: Christoph Hellwig <hch@infradead.org>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, david@fromorbit.com
Subject: Re: [PATCH 1/3] xfs: clean up bmap intent item recovery checking
Date: Wed, 23 Sep 2020 08:16:14 +0100 [thread overview]
Message-ID: <20200923071614.GA29203@infradead.org> (raw)
In-Reply-To: <160031337029.3624582.3821482653073391016.stgit@magnolia>
On Wed, Sep 16, 2020 at 08:29:30PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> The bmap intent item checking code in xfs_bui_item_recover is spread all
> over the function. We should check the recovered log item at the top
> before we allocate any resources or do anything else, so do that.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/xfs_bmap_item.c | 57 ++++++++++++++++--------------------------------
> 1 file changed, 19 insertions(+), 38 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
> index 0a0904a7650a..877afe76d76a 100644
> --- a/fs/xfs/xfs_bmap_item.c
> +++ b/fs/xfs/xfs_bmap_item.c
> @@ -437,17 +437,13 @@ xfs_bui_item_recover(
> xfs_fsblock_t inode_fsb;
> xfs_filblks_t count;
> xfs_exntst_t state;
> - enum xfs_bmap_intent_type type;
> - bool op_ok;
> unsigned int bui_type;
> int whichfork;
> int error = 0;
>
> /* Only one mapping operation per BUI... */
> - if (buip->bui_format.bui_nextents != XFS_BUI_MAX_FAST_EXTENTS) {
> - xfs_bui_release(buip);
> - return -EFSCORRUPTED;
> - }
> + if (buip->bui_format.bui_nextents != XFS_BUI_MAX_FAST_EXTENTS)
> + goto garbage;
We don't really need the xfs_bui_release any more, and can stick to
plain "return -EFSCORRUPTED" instead of the goto, but I suspect the
previous patch has taken care of that and you've rebased already?
Otherwise looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
next prev parent reply other threads:[~2020-09-23 7:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 3:29 [PATCH 0/3] xfs: fix inode use-after-free during log recovery Darrick J. Wong
2020-09-17 3:29 ` [PATCH 1/3] xfs: clean up bmap intent item recovery checking Darrick J. Wong
2020-09-17 5:09 ` Dave Chinner
2020-09-23 7:16 ` Christoph Hellwig [this message]
2020-09-23 15:22 ` Darrick J. Wong
2020-09-17 3:29 ` [PATCH 2/3] xfs: clean up xfs_bui_item_recover iget/trans_alloc/ilock ordering Darrick J. Wong
2020-09-17 5:13 ` Dave Chinner
2020-09-17 6:47 ` Darrick J. Wong
2020-09-17 7:08 ` [PATCH v2 " Darrick J. Wong
2020-09-17 8:19 ` Dave Chinner
2020-09-23 7:17 ` Christoph Hellwig
2020-09-17 3:29 ` [PATCH 3/3] xfs: fix an incore inode UAF in xfs_bui_recover Darrick J. Wong
2020-09-23 7:20 ` Christoph Hellwig
2020-09-23 15:55 ` Darrick J. Wong
2020-09-24 6:06 ` [PATCH v2 " Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-09-27 23:41 [PATCH v2 0/3] xfs: fix inode use-after-free during log recovery Darrick J. Wong
2020-09-27 23:41 ` [PATCH 1/3] xfs: clean up bmap intent item recovery checking Darrick J. Wong
2020-09-29 17:43 [PATCH v3 0/3] xfs: fix inode use-after-free during log recovery Darrick J. Wong
2020-09-29 17:43 ` [PATCH 1/3] xfs: clean up bmap intent item recovery checking Darrick J. Wong
2020-10-05 18:20 [PATCH v4 0/3] xfs: fix inode use-after-free during log recovery Darrick J. Wong
2020-10-05 18:20 ` [PATCH 1/3] xfs: clean up bmap intent item recovery checking 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=20200923071614.GA29203@infradead.org \
--to=hch@infradead.org \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.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).