| From 2c4306f719b083d17df2963bc761777576b8ad1b Mon Sep 17 00:00:00 2001 |
| From: Eric Sandeen <sandeen@redhat.com> |
| Date: Mon, 16 Apr 2018 23:07:27 -0700 |
| Subject: xfs: set format back to extents if xfs_bmap_extents_to_btree |
| |
| From: Eric Sandeen <sandeen@redhat.com> |
| |
| commit 2c4306f719b083d17df2963bc761777576b8ad1b upstream. |
| |
| 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@redhat.com> |
| Reviewed-by: Christoph Hellwig <hch@lst.de> |
| Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> |
| Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> |
| Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| fs/xfs/libxfs/xfs_bmap.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/fs/xfs/libxfs/xfs_bmap.c |
| +++ b/fs/xfs/libxfs/xfs_bmap.c |
| @@ -781,6 +781,8 @@ try_another_ag: |
| *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; |
| } |
| @@ -801,6 +803,8 @@ try_another_ag: |
| } |
| 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; |
| } |