xfs_repair: set args.geo in dir2_kill_block

This path in xfs_repair:

dir2_kill_block
	libxfs_da_shrink_inode
		xfs_dir2_shrink_inode
			xfs_dir2_db_to_da

segfaults, because dir2_kill_block() does not initialize
args.geo, and a null geometry winds up in xfs_dir2_db_to_da(),
which dereferences it.

Fix that.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/repair/phase6.c b/repair/phase6.c
index 04638c2038ef017d21839ef6d78aa4b238a78f08..7e275cdaba0456fe854dff5355bc804cee9d0f15 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1444,6 +1444,7 @@ dir2_kill_block(
        args.firstblock = &firstblock;
        args.flist = &flist;
        args.whichfork = XFS_DATA_FORK;
+       args.geo = mp->m_dir_geo;
        if (da_bno >= mp->m_dir_geo->leafblk && da_bno < mp->m_dir_geo->freeblk)
                error = -libxfs_da_shrink_inode(&args, da_bno, bp);
        else