| Message ID | 158388766642.939165.18097752003465610656.stgit@magnolia (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | xfs: fix errors in various verifiers | expand |
On Tue, Mar 10, 2020 at 05:47:46PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Check the owner field of dir3 free block headers and reject the metadata > if there's something wrong with it. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > Reviewed-by: Allison Collins <allison.henderson@oracle.com> > Reviewed-by: Christoph Hellwig <hch@lst.de> > --- > fs/xfs/libxfs/xfs_dir2_node.c | 2 ++ > 1 file changed, 2 insertions(+) > > > diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c > index bbd478ec75c9..6ac4aad98cd7 100644 > --- a/fs/xfs/libxfs/xfs_dir2_node.c > +++ b/fs/xfs/libxfs/xfs_dir2_node.c > @@ -194,6 +194,8 @@ xfs_dir3_free_header_check( > return __this_address; > if (be32_to_cpu(hdr3->nvalid) < be32_to_cpu(hdr3->nused)) > return __this_address; > + if (be64_to_cpu(hdr3->hdr.owner) != dp->i_ino) > + return __this_address; > } else { > struct xfs_dir2_free_hdr *hdr = bp->b_addr; Yup. Reviewed-by: Dave Chinner <dchinner@redhat.com>
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index bbd478ec75c9..6ac4aad98cd7 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c @@ -194,6 +194,8 @@ xfs_dir3_free_header_check( return __this_address; if (be32_to_cpu(hdr3->nvalid) < be32_to_cpu(hdr3->nused)) return __this_address; + if (be64_to_cpu(hdr3->hdr.owner) != dp->i_ino) + return __this_address; } else { struct xfs_dir2_free_hdr *hdr = bp->b_addr;