Skip to contentSkip to conversation

ext2fs_group_first_block2(): 32-bit truncation.

PATCH In review Nick Dokos 3 participants 3 messages Apr 18, 2009 – Apr 21, 2009

lore
Share & tools
lore

Nick Dokos

author
#0 lore raw

PATCH 2/2 ext2fs_group_first_block2(): 32-bit truncation.

ext2fs_group_first_block2() returns the product of the group number and the number of blocks per group (from the superblock). Unfortunately, both of these are 32-bit quantities, so the multiplication result is also 32 bits wide. It is then returned as a 64-bit quantity, but by then, it's too late.

Cast one of the operands to blk64_t, so the multiplication will be done in 64 bits.

e2fsck was complaining about a group that was marked BLOCK_UNINIT, but had blocks in use (it turned out that a different group had blocks in use, but the block numbers of the two different groups differed by 2^32, so this bug conflated them). With this change, this complaint goes away. In addition, dumpe2fs produces the right blocks for all the groups, whereas it was wrapping them at the 32-bit boundary previously.

---
 lib/ext2fs/blknum.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib/ext2fs/blknum.c +1 -1
index b9666fb..fd56d53 100644
@@ -28,7 +28,7 @@ dgrp_t ext2fs_group_of_blk2(ext2_filsys fs, blk64_t blk)
 blk64_t ext2fs_group_first_block2(ext2_filsys fs, dgrp_t group)
 {
 	return fs->super->s_first_data_block +
-		(group * fs->super->s_blocks_per_group);
+		((blk64_t)group * fs->super->s_blocks_per_group);
 }
 
 /*
Signature · 1 line
1.6.0.6
Reviewed-by on v1 2/2
#1 lore raw
Quoted 9 lines · Nick Dokos

ext2fs_group_first_block2() returns the product of the group number and the number of blocks per group (from the superblock). Unfortunately, both of these are 32-bit quantities, so the multiplication result is also 32 bits wide. It is then returned as a 64-bit quantity, but by then, it's too late.

Cast one of the operands to blk64_t, so the multiplication will be done in 64 bits.

Quoted 8 lines

e2fsck was complaining about a group that was marked BLOCK_UNINIT, but had blocks in use (it turned out that a different group had blocks in use, but the block numbers of the two different groups differed by 2^32, so this bug conflated them). With this change, this complaint goes away. In addition, dumpe2fs produces the right blocks for all the groups, whereas it was wrapping them at the 32-bit boundary previously.

This one looks obviously correct, thanks.

Quoted 17 lines
---
 lib/ext2fs/blknum.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib/ext2fs/blknum.c +1 -1
index b9666fb..fd56d53 100644
@@ -28,7 +28,7 @@ dgrp_t ext2fs_group_of_blk2(ext2_filsys fs, blk64_t blk)
 blk64_t ext2fs_group_first_block2(ext2_filsys fs, dgrp_t group)
 {
 	return fs->super->s_first_data_block +
-		(group * fs->super->s_blocks_per_group);
+		((blk64_t)group * fs->super->s_blocks_per_group);
 }
 
 /*
#2 lore raw
In reply to Nick Dokos
Quoted 9 lines · Nick Dokos

ext2fs_group_first_block2() returns the product of the group number and the number of blocks per group (from the superblock). Unfortunately, both of these are 32-bit quantities, so the multiplication result is also 32 bits wide. It is then returned as a 64-bit quantity, but by then, it's too late.

Cast one of the operands to blk64_t, so the multiplication will be done in 64 bits.

Quoted 8 lines

e2fsck was complaining about a group that was marked BLOCK_UNINIT, but had blocks in use (it turned out that a different group had blocks in use, but the block numbers of the two different groups differed by 2^32, so this bug conflated them). With this change, this complaint goes away. In addition, dumpe2fs produces the right blocks for all the groups, whereas it was wrapping them at the 32-bit boundary previously.

Pulled and pushed.

-VAL

Quoted 20 lines
---
 lib/ext2fs/blknum.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib/ext2fs/blknum.c +1 -1
index b9666fb..fd56d53 100644
@@ -28,7 +28,7 @@ dgrp_t ext2fs_group_of_blk2(ext2_filsys fs, blk64_t blk)
 blk64_t ext2fs_group_first_block2(ext2_filsys fs, dgrp_t group)
 {
 	return fs->super->s_first_data_block +
-		(group * fs->super->s_blocks_per_group);
+		((blk64_t)group * fs->super->s_blocks_per_group);
 }
 
 /*
Signature · 1 line
1.6.0.6