Commit 9aa5d32b authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Theodore Ts'o
Browse files

ext4: Replace open coded mdata csum feature to helper function 

Besides the fact that this replacement improves code readability
it also protects from errors caused direct EXT4_S(sb)->s_es manipulation
which may result attempt to use uninitialized  csum machinery.

#Testcase_BEGIN
IMG=/dev/ram0
MNT=/mnt
mkfs.ext4 $IMG
mount $IMG $MNT
#Enable feature directly on disk, on mounted fs
tune2fs -O metadata_csum  $IMG
# Provoke metadata update, likey result in OOPS
touch $MNT/test
umount $MNT
#Testcase_END

# Replacement script
@@
expression E;
@@
- EXT4_HAS_RO_COMPAT_FEATURE(E, EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)
+ ext4_has_metadata_csum(E)

https://bugzilla.kernel.org/show_bug.cgi?id=82201



Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 65dd8327

fs/ext4/bitmap.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -24,8 +24,7 @@ int ext4_inode_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, 
	__u32 provided, calculated;

	__u32 provided, calculated;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_sb_info *sbi = EXT4_SB(sb);





	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,

	if (!ext4_has_metadata_csum(sb))

					EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))

		return 1;

		return 1;





	provided = le16_to_cpu(gdp->bg_inode_bitmap_csum_lo);

	provided = le16_to_cpu(gdp->bg_inode_bitmap_csum_lo);
@@ -46,8 +45,7 @@ void ext4_inode_bitmap_csum_set(struct super_block *sb, ext4_group_t group, 
	__u32 csum;

	__u32 csum;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_sb_info *sbi = EXT4_SB(sb);





	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,

	if (!ext4_has_metadata_csum(sb))

					EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))

		return;

		return;





	csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);

	csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);
@@ -65,8 +63,7 @@ int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	int sz = EXT4_CLUSTERS_PER_GROUP(sb) / 8;

	int sz = EXT4_CLUSTERS_PER_GROUP(sb) / 8;





	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,

	if (!ext4_has_metadata_csum(sb))

					EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))

		return 1;

		return 1;





	provided = le16_to_cpu(gdp->bg_block_bitmap_csum_lo);

	provided = le16_to_cpu(gdp->bg_block_bitmap_csum_lo);
@@ -91,8 +88,7 @@ void ext4_block_bitmap_csum_set(struct super_block *sb, ext4_group_t group, 
	__u32 csum;

	__u32 csum;

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_sb_info *sbi = EXT4_SB(sb);





	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,

	if (!ext4_has_metadata_csum(sb))

			EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))

		return;

		return;





	csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);

	csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);

fs/ext4/ext4.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -2337,6 +2337,14 @@ static inline int ext4_has_group_desc_csum(struct super_block *sb) 
					  EXT4_FEATURE_RO_COMPAT_METADATA_CSUM);

					  EXT4_FEATURE_RO_COMPAT_METADATA_CSUM);

}

}





static inline int ext4_has_metadata_csum(struct super_block *sb)

{

	WARN_ON_ONCE(EXT4_HAS_RO_COMPAT_FEATURE(sb,

			EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &&

		     !EXT4_SB(sb)->s_chksum_driver);



	return (EXT4_SB(sb)->s_chksum_driver != NULL);

}

static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)

static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es)

{

{

	return ((ext4_fsblk_t)le32_to_cpu(es->s_blocks_count_hi) << 32) |

	return ((ext4_fsblk_t)le32_to_cpu(es->s_blocks_count_hi) << 32) |

fs/ext4/extents.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -73,8 +73,7 @@ static int ext4_extent_block_csum_verify(struct inode *inode, 
{

{

	struct ext4_extent_tail *et;

	struct ext4_extent_tail *et;





	if (!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,

	if (!ext4_has_metadata_csum(inode->i_sb))

		EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))

		return 1;

		return 1;





	et = find_ext4_extent_tail(eh);

	et = find_ext4_extent_tail(eh);
@@ -88,8 +87,7 @@ static void ext4_extent_block_csum_set(struct inode *inode, 
{

{

	struct ext4_extent_tail *et;

	struct ext4_extent_tail *et;





	if (!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,

	if (!ext4_has_metadata_csum(inode->i_sb))

		EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))

		return;

		return;





	et = find_ext4_extent_tail(eh);

	et = find_ext4_extent_tail(eh);

fs/ext4/ialloc.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1011,8 +1011,7 @@ got: 
	spin_unlock(&sbi->s_next_gen_lock);

	spin_unlock(&sbi->s_next_gen_lock);





	/* Precompute checksum seed for inode metadata */

	/* Precompute checksum seed for inode metadata */

	if (EXT4_HAS_RO_COMPAT_FEATURE(sb,

	if (ext4_has_metadata_csum(sb)) {

			EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {

		__u32 csum;

		__u32 csum;

		__le32 inum = cpu_to_le32(inode->i_ino);

		__le32 inum = cpu_to_le32(inode->i_ino);

		__le32 gen = cpu_to_le32(inode->i_generation);

		__le32 gen = cpu_to_le32(inode->i_generation);

fs/ext4/inline.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -1128,8 +1128,7 @@ static int ext4_finish_convert_inline_dir(handle_t *handle, 
	memcpy((void *)de, buf + EXT4_INLINE_DOTDOT_SIZE,

	memcpy((void *)de, buf + EXT4_INLINE_DOTDOT_SIZE,

		inline_size - EXT4_INLINE_DOTDOT_SIZE);

		inline_size - EXT4_INLINE_DOTDOT_SIZE);





	if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,

	if (ext4_has_metadata_csum(inode->i_sb))

				       EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))

		csum_size = sizeof(struct ext4_dir_entry_tail);

		csum_size = sizeof(struct ext4_dir_entry_tail);





	inode->i_size = inode->i_sb->s_blocksize;

	inode->i_size = inode->i_sb->s_blocksize;

CRA Git | Maintained and supported by SUSTech CRA and CCSE