From: Eric Sandeen <sandeen@sandeen.net>
Date: Wed, 2 Sep 2015 22:40:50 +0000 (+1000)
Subject: xfs_repair: set args.geo in longform_dir2_entry_check_data
X-Git-Tag: v4.2.0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5459506e64df9a8e943dd855f3dc81203e31946;p=thirdparty%2Fxfsprogs-dev.git

xfs_repair: set args.geo in longform_dir2_entry_check_data

Here's another one where we miss setting da_args->geo:

longform_dir2_entry_check_data
        struct xfs_da_args      da = {
                .dp = ip,
		// .geo is unset
        };
...
	libxfs_dir2_data_make_free(&da ...)
		xfs_dir2_data_make_free
			endptr = (char *)hdr + args->geo->blksize;
				BOOM

Addresses-Coverity-Id: 1298008
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/repair/phase6.c b/repair/phase6.c
index 7e275cdab..e41bf201c 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -1507,6 +1507,7 @@ longform_dir2_entry_check_data(
 	int			wantmagic;
 	struct xfs_da_args	da = {
 		.dp = ip,
+		.geo = mp->m_dir_geo,
 	};