From 369c0b5f82be66f81b03dea1115f6b1dc1bca529 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Wed, 23 May 2018 16:30:48 -0500 Subject: [PATCH] xfs_repair: don't assert on bad '.' entry in no-modify mode During phase 3, we check the '.' entry of a directory inode and (in modify mode) zap it if the name isn't valid. During phase 6, we assert that the '.' entry now reflects the correct name. In no-modify mode this is incorrect because we didn't actually fix anything, so repair asserts and crashes. Found by fuzzing bu[0].namelen = 4 in xfs/387 and running xfs_repair -n. Signed-off-by: Darrick J. Wong Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- repair/phase6.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repair/phase6.c b/repair/phase6.c index 2005e4066..e65fc4a0f 100644 --- a/repair/phase6.c +++ b/repair/phase6.c @@ -1884,7 +1884,8 @@ longform_dir2_entry_check_data( * of when directory is moved to orphanage. */ if (ip->i_ino == inum) { - ASSERT(dep->name[0] == '.' && dep->namelen == 1); + ASSERT(no_modify || + (dep->name[0] == '.' && dep->namelen == 1)); add_inode_ref(current_irec, current_ino_offset); if (da_bno != 0 || dep != M_DIROPS(mp)->data_entry_p(d)) { -- 2.47.2