]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs_repair: don't assert on bad '.' entry in no-modify mode
authorDarrick J. Wong <darrick.wong@oracle.com>
Wed, 23 May 2018 21:30:48 +0000 (16:30 -0500)
committerEric Sandeen <sandeen@redhat.com>
Wed, 23 May 2018 21:30:48 +0000 (16:30 -0500)
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 <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
repair/phase6.c

index 2005e4066dda3c639b32cd8b1f651874ece909df..e65fc4a0f9434d57891afd889a95e0ef440b1acd 100644 (file)
@@ -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)) {