Skip to contentSkip to conversation

xfs_repair: set args.geo in dir2_kill_block

PATCH In review Eric Sandeen 2 participants 3 messages Jul 23, 2015 – Aug 25, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

repair/phase6.c +1 -0
index de445c6..0c952ed 100644
@@ -1438,6 +1438,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

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#2 lore raw
In reply to Eric Sandeen

Dave, ping on this?

Thanks,
-Eric

Quoted 29 lines · Eric Sandeen

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.

---

repair/phase6.c +1 -0
index de445c6..0c952ed 100644
@@ -1438,6 +1438,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
Quoted 5 lines

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs