Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 171a7f21 authored by Dmitry Monakhov's avatar Dmitry Monakhov Committed by Theodore Ts'o
Browse files

ext4: fix big-endian bug in metadata checksum calculations 



Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 0b65349e

fs/ext4/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -55,21 +55,21 @@ static __u32 ext4_inode_csum(struct inode *inode, struct ext4_inode *raw, 
	__u16 csum_hi = 0;

	__u32 csum;



	csum_lo = raw->i_checksum_lo;

	csum_lo = le16_to_cpu(raw->i_checksum_lo);

	raw->i_checksum_lo = 0;

	if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE &&

	    EXT4_FITS_IN_INODE(raw, ei, i_checksum_hi)) {

		csum_hi = raw->i_checksum_hi;

		csum_hi = le16_to_cpu(raw->i_checksum_hi);

		raw->i_checksum_hi = 0;

	}



	csum = ext4_chksum(sbi, ei->i_csum_seed, (__u8 *)raw,

			   EXT4_INODE_SIZE(inode->i_sb));



	raw->i_checksum_lo = csum_lo;

	raw->i_checksum_lo = cpu_to_le16(csum_lo);

	if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE &&

	    EXT4_FITS_IN_INODE(raw, ei, i_checksum_hi))

		raw->i_checksum_hi = csum_hi;

		raw->i_checksum_hi = cpu_to_le16(csum_hi);



	return csum;

}

fs/ext4/mmp.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include "ext4.h"



/* Checksumming functions */

static __u32 ext4_mmp_csum(struct super_block *sb, struct mmp_struct *mmp)

static __le32 ext4_mmp_csum(struct super_block *sb, struct mmp_struct *mmp)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	int offset = offsetof(struct mmp_struct, mmp_checksum);