| Message ID | 20180719152516.GG4813@magnolia (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Thu, Jul 19, 2018 at 08:25:16AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Check the leaf attribute freemap when we're verifying the block. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> > --- > v2: add comments about alignment > --- Reviewed-by: Brian Foster <bfoster@redhat.com> > fs/xfs/libxfs/xfs_attr_leaf.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index 76e90046731c..a673037c7d37 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -244,6 +244,8 @@ xfs_attr3_leaf_verify( > struct xfs_attr_leafblock *leaf = bp->b_addr; > struct xfs_perag *pag = bp->b_pag; > struct xfs_attr_leaf_entry *entries; > + uint16_t end; > + int i; > > xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr, leaf); > > @@ -289,6 +291,26 @@ xfs_attr3_leaf_verify( > /* XXX: need to range check rest of attr header values */ > /* XXX: hash order check? */ > > + /* > + * Quickly check the freemap information. Attribute data has to be > + * aligned to 4-byte boundaries, and likewise for the free space. > + */ > + for (i = 0; i < XFS_ATTR_LEAF_MAPSIZE; i++) { > + if (ichdr.freemap[i].base > mp->m_attr_geo->blksize) > + return __this_address; > + if (ichdr.freemap[i].base & 0x3) > + return __this_address; > + if (ichdr.freemap[i].size > mp->m_attr_geo->blksize) > + return __this_address; > + if (ichdr.freemap[i].size & 0x3) > + return __this_address; > + end = ichdr.freemap[i].base + ichdr.freemap[i].size; > + if (end < ichdr.freemap[i].base) > + return __this_address; > + if (end > mp->m_attr_geo->blksize) > + return __this_address; > + } > + > return NULL; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jul 19, 2018 at 08:25:16AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Check the leaf attribute freemap when we're verifying the block. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> > --- > v2: add comments about alignment > --- > fs/xfs/libxfs/xfs_attr_leaf.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > Thanks for the comment and explanation Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> > diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c > index 76e90046731c..a673037c7d37 100644 > --- a/fs/xfs/libxfs/xfs_attr_leaf.c > +++ b/fs/xfs/libxfs/xfs_attr_leaf.c > @@ -244,6 +244,8 @@ xfs_attr3_leaf_verify( > struct xfs_attr_leafblock *leaf = bp->b_addr; > struct xfs_perag *pag = bp->b_pag; > struct xfs_attr_leaf_entry *entries; > + uint16_t end; > + int i; > > xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr, leaf); > > @@ -289,6 +291,26 @@ xfs_attr3_leaf_verify( > /* XXX: need to range check rest of attr header values */ > /* XXX: hash order check? */ > > + /* > + * Quickly check the freemap information. Attribute data has to be > + * aligned to 4-byte boundaries, and likewise for the free space. > + */ > + for (i = 0; i < XFS_ATTR_LEAF_MAPSIZE; i++) { > + if (ichdr.freemap[i].base > mp->m_attr_geo->blksize) > + return __this_address; > + if (ichdr.freemap[i].base & 0x3) > + return __this_address; > + if (ichdr.freemap[i].size > mp->m_attr_geo->blksize) > + return __this_address; > + if (ichdr.freemap[i].size & 0x3) > + return __this_address; > + end = ichdr.freemap[i].base + ichdr.freemap[i].size; > + if (end < ichdr.freemap[i].base) > + return __this_address; > + if (end > mp->m_attr_geo->blksize) > + return __this_address; > + } > + > return NULL; > } >
On Thu, Jul 19, 2018 at 08:25:16AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Check the leaf attribute freemap when we're verifying the block. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> > Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de> -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 76e90046731c..a673037c7d37 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -244,6 +244,8 @@ xfs_attr3_leaf_verify( struct xfs_attr_leafblock *leaf = bp->b_addr; struct xfs_perag *pag = bp->b_pag; struct xfs_attr_leaf_entry *entries; + uint16_t end; + int i; xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr, leaf); @@ -289,6 +291,26 @@ xfs_attr3_leaf_verify( /* XXX: need to range check rest of attr header values */ /* XXX: hash order check? */ + /* + * Quickly check the freemap information. Attribute data has to be + * aligned to 4-byte boundaries, and likewise for the free space. + */ + for (i = 0; i < XFS_ATTR_LEAF_MAPSIZE; i++) { + if (ichdr.freemap[i].base > mp->m_attr_geo->blksize) + return __this_address; + if (ichdr.freemap[i].base & 0x3) + return __this_address; + if (ichdr.freemap[i].size > mp->m_attr_geo->blksize) + return __this_address; + if (ichdr.freemap[i].size & 0x3) + return __this_address; + end = ichdr.freemap[i].base + ichdr.freemap[i].size; + if (end < ichdr.freemap[i].base) + return __this_address; + if (end > mp->m_attr_geo->blksize) + return __this_address; + } + return NULL; }