Skip to content

Commit d11502f

Browse files
riteshharjanigregkh
authored andcommitted
ext4: fix loff_t overflow in ext4_max_bitmap_size()
commit 75ca6ad upstream. We should use unsigned long long rather than loff_t to avoid overflow in ext4_max_bitmap_size() for comparison before returning. w/o this patch sbi->s_bitmap_maxbytes was becoming a negative value due to overflow of upper_limit (with has_huge_files as true) Below is a quick test to trigger it on a 64KB pagesize system. sudo mkfs.ext4 -b 65536 -O ^has_extents,^64bit /dev/loop2 sudo mount /dev/loop2 /mnt sudo echo "hello" > /mnt/hello -> This will error out with "echo: write error: File too large" Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com> Reviewed-by: Jan Kara <jack@suse.cz> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: stable@kernel.org Link: https://lore.kernel.org/r/594f409e2c543e90fd836b78188dfa5c575065ba.1622867594.git.riteshh@linux.ibm.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7cea848 commit d11502f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/ext4/super.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3194,17 +3194,17 @@ static loff_t ext4_max_size(int blkbits, int has_huge_files)
31943194
*/
31953195
static loff_t ext4_max_bitmap_size(int bits, int has_huge_files)
31963196
{
3197-
loff_t res = EXT4_NDIR_BLOCKS;
3197+
unsigned long long upper_limit, res = EXT4_NDIR_BLOCKS;
31983198
int meta_blocks;
3199-
loff_t upper_limit;
3200-
/* This is calculated to be the largest file size for a dense, block
3199+
3200+
/*
3201+
* This is calculated to be the largest file size for a dense, block
32013202
* mapped file such that the file's total number of 512-byte sectors,
32023203
* including data and all indirect blocks, does not exceed (2^48 - 1).
32033204
*
32043205
* __u32 i_blocks_lo and _u16 i_blocks_high represent the total
32053206
* number of 512-byte sectors of the file.
32063207
*/
3207-
32083208
if (!has_huge_files) {
32093209
/*
32103210
* !has_huge_files or implies that the inode i_block field
@@ -3247,7 +3247,7 @@ static loff_t ext4_max_bitmap_size(int bits, int has_huge_files)
32473247
if (res > MAX_LFS_FILESIZE)
32483248
res = MAX_LFS_FILESIZE;
32493249

3250-
return res;
3250+
return (loff_t)res;
32513251
}
32523252

32533253
static ext4_fsblk_t descriptor_loc(struct super_block *sb,

0 commit comments

Comments
 (0)