korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-26 19:43:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

libext2fs: fix potential integer overflow in bitmap accessors

Browse Source 
bmap->cluster_bits has a maximum value of 19, but Coverity doesn't
know that.  To make it happy, and just in case there is a bug where
somehow the cluster size does get set to an invalid value and the rest
of the library doesn't check it, use 1ULL instead of 1 to avoid the
integer overflow.

Addresses-Coverity-Bug: 1500759
Addresses-Coverity-Bug: 1500764
Addresses-Coverity-Bug: 1500771
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Theodore Ts'o 2022-08-09 11:16:47 -04:00
parent 7464397a0c
commit 27504bcf89
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ext2fs/gen_bitmap64.c
View File

@ -684,7 +684,7 @@ int ext2fs_test_block_bitmap_range2(ext2fs_block_bitmap gen_bmap,
/* convert to clusters if necessary */ /* convert to clusters if necessary */
block >>= bmap->cluster_bits; block >>= bmap->cluster_bits;
end += (1 << bmap->cluster_bits) - 1; end += (1ULL << bmap->cluster_bits) - 1;
end >>= bmap->cluster_bits; end >>= bmap->cluster_bits;
num = end - block; num = end - block;
@ -725,7 +725,7 @@ void ext2fs_mark_block_bitmap_range2(ext2fs_block_bitmap gen_bmap,
/* convert to clusters if necessary */ /* convert to clusters if necessary */
block >>= bmap->cluster_bits; block >>= bmap->cluster_bits;
end += (1 << bmap->cluster_bits) - 1; end += (1ULL << bmap->cluster_bits) - 1;
end >>= bmap->cluster_bits; end >>= bmap->cluster_bits;
num = end - block; num = end - block;
@ -766,7 +766,7 @@ void ext2fs_unmark_block_bitmap_range2(ext2fs_block_bitmap gen_bmap,
/* convert to clusters if necessary */ /* convert to clusters if necessary */
block >>= bmap->cluster_bits; block >>= bmap->cluster_bits;
end += (1 << bmap->cluster_bits) - 1; end += (1ULL << bmap->cluster_bits) - 1;
end >>= bmap->cluster_bits; end >>= bmap->cluster_bits;
num = end - block; num = end - block;