Re: [PATCH 4/4] xfs: check owner of dir3 blocks

Allison Collins
2020-03-02T18:12:35Z

On 2/28/20 6:49 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Check the owner field of dir3 block headers.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Same question here with the release buffer api change.

Allison
> ---
> fs/xfs/libxfs/xfs_dir2_block.c | 34 +++++++++++++++++++++++++++++++++-
> 1 file changed, 33 insertions(+), 1 deletion(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c
> index d6ced59b9567..408a9d7c8c24 100644
> --- a/fs/xfs/libxfs/xfs_dir2_block.c
> +++ b/fs/xfs/libxfs/xfs_dir2_block.c
> @@ -20,6 +20,7 @@
> #include "xfs_error.h"
> #include "xfs_trace.h"
> #include "xfs_log.h"
> +#include "xfs_health.h"
>
> /*
> * Local function prototypes.
> @@ -114,6 +115,23 @@ const struct xfs_buf_ops xfs_dir3_block_buf_ops = {
> .verify_struct = xfs_dir3_block_verify,
> };
>
> +static xfs_failaddr_t
> +xfs_dir3_block_header_check(
> + struct xfs_inode *dp,
> + struct xfs_buf *bp)
> +{
> + struct xfs_mount *mp = dp->i_mount;
> +
> + if (xfs_sb_version_hascrc(&mp->m_sb)) {
> + struct xfs_dir3_blk_hdr *hdr3 = bp->b_addr;
> +
> + if (be64_to_cpu(hdr3->owner) != dp->i_ino)
> + return __this_address;
> + }
> +
> + return NULL;
> +}
> +
> int
> xfs_dir3_block_read(
> struct xfs_trans *tp,
> @@ -121,11 +139,25 @@ xfs_dir3_block_read(
> struct xfs_buf **bpp)
> {
> struct xfs_mount *mp = dp->i_mount;
> + xfs_failaddr_t fa;
> int err;
>
> err = xfs_da_read_buf(tp, dp, mp->m_dir_geo->datablk, 0, bpp,
> XFS_DATA_FORK, &xfs_dir3_block_buf_ops);
> - if (!err && tp && *bpp)
> + if (err || !*bpp)
> + return err;
> +
> + /* Check things that we can't do in the verifier. */
> + fa = xfs_dir3_block_header_check(dp, *bpp);
> + if (fa) {
> + xfs_verifier_error(*bpp, -EFSCORRUPTED, fa);
> + (*bpp)->b_flags &= ~XBF_DONE;
> + xfs_trans_brelse(tp, *bpp);
> + *bpp = NULL;
> + return -EFSCORRUPTED;
> + }
> +
> + if (tp)
> xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_BLOCK_BUF);
> return err;
> }
>