Commit 50aa90ef authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: verify dinode header first 



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: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent bc1a09b8

fs/xfs/libxfs/xfs_inode_buf.c

+13 −10
Original line number Diff line number Diff line
@@ -393,6 +393,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;
@@ -409,16 +422,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE