On Mon, Apr 16, 2018 at 11:26:12PM -0500, Eric Sandeen wrote: > If xfs_bmap_extents_to_btree fails in a mode where we call > xfs_iroot_realloc(-1) to de-allocate the root, set the > format back to extents. > > Otherwise we can assume we can dereference ifp->if_broot > based on the XFS_DINODE_FMT_BTREE format, and crash. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199423 > Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx> Looks ok, will test... Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --D > --- > > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 6a7c2f0..040eeda 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -725,12 +725,16 @@ static inline bool xfs_bmap_wants_extents(struct xfs_inode *ip, int whichfork) > *logflagsp = 0; > if ((error = xfs_alloc_vextent(&args))) { > xfs_iroot_realloc(ip, -1, whichfork); > + ASSERT(ifp->if_broot == NULL); > + XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS); > xfs_btree_del_cursor(cur, XFS_BTREE_ERROR); > return error; > } > > if (WARN_ON_ONCE(args.fsbno == NULLFSBLOCK)) { > xfs_iroot_realloc(ip, -1, whichfork); > + ASSERT(ifp->if_broot == NULL); > + XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS); > xfs_btree_del_cursor(cur, XFS_BTREE_ERROR); > return -ENOSPC; > } > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
