From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 06/10] xfs: improve the code that checks recovered refcount intent items
Date: Fri, 4 Dec 2020 09:00:12 -0500 [thread overview]
Message-ID: <20201204140012.GH1404170@bfoster> (raw)
In-Reply-To: <160704433239.734470.17983823126192826984.stgit@magnolia>
On Thu, Dec 03, 2020 at 05:12:12PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> The code that validates recovered refcount intent items is kind of a
> mess -- it doesn't use the standard xfs type validators, and it doesn't
> check for things that it should. Fix the validator function to use the
> standard validation helpers and look for more types of obvious errors.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_refcount_item.c | 23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
> index a456a2fb794c..8ad6c81f6d8f 100644
> --- a/fs/xfs/xfs_refcount_item.c
> +++ b/fs/xfs/xfs_refcount_item.c
> @@ -423,27 +423,26 @@ xfs_cui_validate_phys(
> struct xfs_mount *mp,
> struct xfs_phys_extent *refc)
> {
> - xfs_fsblock_t startblock_fsb;
> - bool op_ok;
> + if (refc->pe_flags & ~XFS_REFCOUNT_EXTENT_FLAGS)
> + return false;
>
> - startblock_fsb = XFS_BB_TO_FSB(mp,
> - XFS_FSB_TO_DADDR(mp, refc->pe_startblock));
> switch (refc->pe_flags & XFS_REFCOUNT_EXTENT_TYPE_MASK) {
> case XFS_REFCOUNT_INCREASE:
> case XFS_REFCOUNT_DECREASE:
> case XFS_REFCOUNT_ALLOC_COW:
> case XFS_REFCOUNT_FREE_COW:
> - op_ok = true;
> break;
> default:
> - op_ok = false;
> - break;
> + return false;
> }
> - if (!op_ok || startblock_fsb == 0 ||
> - refc->pe_len == 0 ||
> - startblock_fsb >= mp->m_sb.sb_dblocks ||
> - refc->pe_len >= mp->m_sb.sb_agblocks ||
> - (refc->pe_flags & ~XFS_REFCOUNT_EXTENT_FLAGS))
> +
> + if (refc->pe_startblock + refc->pe_len <= refc->pe_startblock)
> + return false;
> +
> + if (!xfs_verify_fsbno(mp, refc->pe_startblock))
> + return false;
> +
> + if (!xfs_verify_fsbno(mp, refc->pe_startblock + refc->pe_len - 1))
> return false;
>
> return true;
>
next prev parent reply other threads:[~2020-12-04 14:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 1:11 [PATCH v2 00/10] xfs: strengthen log intent validation Darrick J. Wong
2020-12-04 1:11 ` [PATCH 01/10] xfs: hoist recovered bmap intent checks out of xfs_bui_item_recover Darrick J. Wong
2020-12-04 13:55 ` Brian Foster
2020-12-04 1:11 ` [PATCH 02/10] xfs: improve the code that checks recovered bmap intent items Darrick J. Wong
2020-12-04 13:56 ` Brian Foster
2020-12-04 19:54 ` Darrick J. Wong
2020-12-04 1:11 ` [PATCH 03/10] xfs: hoist recovered rmap intent checks out of xfs_rui_item_recover Darrick J. Wong
2020-12-04 13:59 ` Brian Foster
2020-12-04 1:12 ` [PATCH 04/10] xfs: improve the code that checks recovered rmap intent items Darrick J. Wong
2020-12-04 13:59 ` Brian Foster
2020-12-04 1:12 ` [PATCH 05/10] xfs: hoist recovered refcount intent checks out of xfs_cui_item_recover Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-04 1:12 ` [PATCH 06/10] xfs: improve the code that checks recovered refcount intent items Darrick J. Wong
2020-12-04 14:00 ` Brian Foster [this message]
2020-12-04 1:12 ` [PATCH 07/10] xfs: hoist recovered extent-free intent checks out of xfs_efi_item_recover Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-04 1:12 ` [PATCH 08/10] xfs: improve the code that checks recovered extent-free intent items Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-04 1:12 ` [PATCH 09/10] xfs: validate feature support when recovering rmap/refcount/bmap intents Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-06 23:08 ` Darrick J. Wong
2020-12-07 14:02 ` Brian Foster
2020-12-07 16:50 ` Darrick J. Wong
2020-12-04 1:12 ` [PATCH 10/10] xfs: trace log intent item recovery failures Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-04 19:57 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-12-06 23:09 [PATCH v3 00/10] xfs: strengthen log intent validation Darrick J. Wong
2020-12-06 23:10 ` [PATCH 06/10] xfs: improve the code that checks recovered refcount intent items Darrick J. Wong
2020-12-01 3:37 [PATCH 00/10] xfs: strengthen log intent validation Darrick J. Wong
2020-12-01 3:38 ` [PATCH 06/10] xfs: improve the code that checks recovered refcount intent items Darrick J. Wong
2020-12-01 10:06 ` Christoph Hellwig
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=20201204140012.GH1404170@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=hch@lst.de \
--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