xfs: verify dinode header first

Source kernel commit: 50aa90ef03007beca2c9108993f5b4f2bb4f0a66

Move the v3 inode integrity information (crc, owner, metauuid) before we
look at anything else in the inode so that we don't waste time on a torn
write or a totally garbled block.  This makes xfs_dinode_verify more
consistent with the other verifiers.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index e82e56d922e906f5597ed1bf67892c026ef186a8..ba75e9aa4cf3851c8b8b28dbb92f4defbd1fe2f0 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -391,6 +391,19 @@ xfs_dinode_verify(
        if (dip->di_magic != cpu_to_be16(XFS_DINODE_MAGIC))
                return __this_address;
 
+       /* Verify v3 integrity information first */
+       if (dip->di_version >= 3) {
+               if (!xfs_sb_version_hascrc(&mp->m_sb))
+                       return __this_address;
+               if (!xfs_verify_cksum((char *)dip, mp->m_sb.sb_inodesize,
+                                     XFS_DINODE_CRC_OFF))
+                       return __this_address;
+               if (be64_to_cpu(dip->di_ino) != ino)
+                       return __this_address;
+               if (!uuid_equal(&dip->di_uuid, &mp->m_sb.sb_meta_uuid))
+                       return __this_address;
+       }
+
        /* don't allow invalid i_size */
        if (be64_to_cpu(dip->di_size) & (1ULL << 63))
                return __this_address;
@@ -407,16 +420,6 @@ xfs_dinode_verify(
        if (dip->di_version < 3)
                return NULL;
 
-       if (!xfs_sb_version_hascrc(&mp->m_sb))
-               return __this_address;
-       if (!xfs_verify_cksum((char *)dip, mp->m_sb.sb_inodesize,
-                             XFS_DINODE_CRC_OFF))
-               return __this_address;
-       if (be64_to_cpu(dip->di_ino) != ino)
-               return __this_address;
-       if (!uuid_equal(&dip->di_uuid, &mp->m_sb.sb_meta_uuid))
-               return __this_address;
-
        flags = be16_to_cpu(dip->di_flags);
        flags2 = be64_to_cpu(dip->di_flags2);