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

Commit a60697f4 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: fix data offset overflow in ext4_xattr_fiemap() on 32-bit archs 



On 32-bit architectures with 32-bit sector_t computation of data offset
in ext4_xattr_fiemap() can overflow resulting in reporting bogus data
location. Fix the problem by typing block number to proper type before
shifting.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent e7293fd1

fs/ext4/extents.c

+2 −2
Original line number Diff line number Diff line
@@ -4679,7 +4679,7 @@ static int ext4_xattr_fiemap(struct inode *inode, 
		error = ext4_get_inode_loc(inode, &iloc);

		if (error)

			return error;

		physical = iloc.bh->b_blocknr << blockbits;

		physical = (__u64)iloc.bh->b_blocknr << blockbits;

		offset = EXT4_GOOD_OLD_INODE_SIZE +

				EXT4_I(inode)->i_extra_isize;

		physical += offset;
@@ -4687,7 +4687,7 @@ static int ext4_xattr_fiemap(struct inode *inode, 
		flags |= FIEMAP_EXTENT_DATA_INLINE;

		brelse(iloc.bh);

	} else { /* external block */

		physical = EXT4_I(inode)->i_file_acl << blockbits;

		physical = (__u64)EXT4_I(inode)->i_file_acl << blockbits;

		length = inode->i_sb->s_blocksize;

	}