From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 04/10] xfs: improve the code that checks recovered rmap intent items
Date: Fri, 4 Dec 2020 08:59:58 -0500 [thread overview]
Message-ID: <20201204135958.GF1404170@bfoster> (raw)
In-Reply-To: <160704432023.734470.2330496983684892697.stgit@magnolia>
On Thu, Dec 03, 2020 at 05:12:00PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> The code that validates recovered rmap 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: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_rmap_item.c | 30 ++++++++++++++++++------------
> 1 file changed, 18 insertions(+), 12 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c
> index d77d104d93c6..f296ec349936 100644
> --- a/fs/xfs/xfs_rmap_item.c
> +++ b/fs/xfs/xfs_rmap_item.c
> @@ -466,11 +466,9 @@ xfs_rui_validate_map(
> struct xfs_mount *mp,
> struct xfs_map_extent *rmap)
> {
> - xfs_fsblock_t startblock_fsb;
> - bool op_ok;
> + if (rmap->me_flags & ~XFS_RMAP_EXTENT_FLAGS)
> + return false;
>
> - startblock_fsb = XFS_BB_TO_FSB(mp,
> - XFS_FSB_TO_DADDR(mp, rmap->me_startblock));
> switch (rmap->me_flags & XFS_RMAP_EXTENT_TYPE_MASK) {
> case XFS_RMAP_EXTENT_MAP:
> case XFS_RMAP_EXTENT_MAP_SHARED:
> @@ -480,17 +478,25 @@ xfs_rui_validate_map(
> case XFS_RMAP_EXTENT_CONVERT_SHARED:
> case XFS_RMAP_EXTENT_ALLOC:
> case XFS_RMAP_EXTENT_FREE:
> - op_ok = true;
> break;
> default:
> - op_ok = false;
> - break;
> + return false;
> }
> - if (!op_ok || startblock_fsb == 0 ||
> - rmap->me_len == 0 ||
> - startblock_fsb >= mp->m_sb.sb_dblocks ||
> - rmap->me_len >= mp->m_sb.sb_agblocks ||
> - (rmap->me_flags & ~XFS_RMAP_EXTENT_FLAGS))
> +
> + if (!XFS_RMAP_NON_INODE_OWNER(rmap->me_owner) &&
> + !xfs_verify_ino(mp, rmap->me_owner))
> + return false;
> +
> + if (rmap->me_startoff + rmap->me_len <= rmap->me_startoff)
> + return false;
> +
> + if (rmap->me_startblock + rmap->me_len <= rmap->me_startblock)
> + return false;
> +
> + if (!xfs_verify_fsbno(mp, rmap->me_startblock))
> + return false;
> +
> + if (!xfs_verify_fsbno(mp, rmap->me_startblock + rmap->me_len - 1))
> return false;
>
> return true;
>
next prev parent reply other threads:[~2020-12-04 14:01 UTC|newest]
Thread overview: 30+ 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 [this message]
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
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 04/10] xfs: improve the code that checks recovered rmap 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 04/10] xfs: improve the code that checks recovered rmap intent items Darrick J. Wong
2020-12-01 10:05 ` Christoph Hellwig
2020-12-01 16:33 ` 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=20201204135958.GF1404170@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 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.