diff mbox series

[02/10] ext2fs: Fix overflow when checking s_inodes_count in ext2fs_open()

Message ID 20180612095328.5215-3-jack@suse.cz
State Accepted, archived
Headers show
Series e2fsprogs: Handle s_inodes_count overflow better | expand

Commit Message

Jan Kara June 12, 2018, 9:53 a.m. UTC 
The check whether s_inodes_count is correct in ext2fs_open() can
overflow and thus not catch all problematic cases. Fix the test.

Reviewed-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Jan Kara <jack@suse.cz>
---
 lib/ext2fs/openfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Theodore Ts'o June 19, 2018, 2:43 p.m. UTC | #1 
On Tue, Jun 12, 2018 at 11:53:20AM +0200, Jan Kara wrote:
> The check whether s_inodes_count is correct in ext2fs_open() can
> overflow and thus not catch all problematic cases. Fix the test.
> 
> Reviewed-by: Andreas Dilger <adilger@dilger.ca>
> Signed-off-by: Jan Kara <jack@suse.cz>

Applied, thanks.

					- Ted
diff mbox series

Patch

diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index 532e70f7f645..e9ad0cd1a2c6 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -386,7 +386,7 @@  errcode_t ext2fs_open2(const char *name, const char *io_options,
 		goto cleanup;
 	}
 	fs->group_desc_count = 	groups_cnt;
-	if (fs->group_desc_count * EXT2_INODES_PER_GROUP(fs->super) !=
+	if ((__u64)fs->group_desc_count * EXT2_INODES_PER_GROUP(fs->super) !=
 	    fs->super->s_inodes_count) {
 		retval = EXT2_ET_CORRUPT_SUPERBLOCK;
 		goto cleanup;