From: Jan Kara Date: Fri, 31 May 2013 23:33:42 +0000 (-0400) Subject: ext4: fix data offset overflow on 32-bit archs in ext4_inline_data_fiemap() X-Git-Tag: v3.11-rc1~165^2~63 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;ds=sidebyside;h=eaf3793728d07d995f1e74250b2d0005f7ae98b5;p=~andy%2Flinux ext4: fix data offset overflow on 32-bit archs in ext4_inline_data_fiemap() On 32-bit archs when sector_t is defined as 32-bit the logic computing data offset in ext4_inline_data_fiemap(). Fix that by properly typing the shifted value. Signed-off-by: Jan Kara Signed-off-by: Theodore Ts'o --- diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 3e2bf873e8a..33331b4c217 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1842,7 +1842,7 @@ int ext4_inline_data_fiemap(struct inode *inode, if (error) goto out; - physical = iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits; + physical = (__u64)iloc.bh->b_blocknr << inode->i_sb->s_blocksize_bits; physical += (char *)ext4_raw_inode(&iloc) - iloc.bh->b_data; physical += offsetof(struct ext4_inode, i_block); length = i_size_read(inode);