]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: inode recovery does not validate the recovered inode
authorDave Chinner <dchinner@redhat.com>
Thu, 15 Feb 2024 08:27:54 +0000 (09:27 +0100)
committerCarlos Maiolino <cem@kernel.org>
Thu, 15 Feb 2024 11:56:43 +0000 (12:56 +0100)
Source kernel commit: 038ca189c0d2c1570b4d922f25b524007c85cf94

Discovered when trying to track down a weird recovery corruption
issue that wasn't detected at recovery time.

The specific corruption was a zero extent count field when big
extent counts are in use, and it turns out the dinode verifier
doesn't detect that specific corruption case, either. So fix it too.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>
libxfs/xfs_inode_buf.c

index 74a1bd22741db4cdfa4a603255c2e01f8787121b..fd351c252af013b781d975dfb0132b3cc5680aa7 100644 (file)
@@ -507,6 +507,9 @@ xfs_dinode_verify(
        if (mode && nextents + naextents > nblocks)
                return __this_address;
 
+       if (nextents + naextents == 0 && nblocks != 0)
+               return __this_address;
+
        if (S_ISDIR(mode) && nextents > mp->m_dir_geo->max_extents)
                return __this_address;