Re: [PATCH] ext4: fix null pointer deref on mount

[Thiemo Nagel <thiemo.nagel@ph.tum.de>]

Theodore Tso wrote:
> I'd rewrite the test as:
> 	/*
> 	 * It makes no sense for the first data block to be beyond the end
> 	 * of the filesystem.
> 	 */
> 	if (le32_to_cpu(es->s_first_data_block) >= ext4_blocks_count(es)) {
>   		printk(KERN_WARNING "EXT4-fs: bad geometry: first data"
> 			"block %u is beyond end of filesystem(%llu)\n",
> 			le32_to_cpu(es->s_first_data_block),
> 			ext4_blocks_count(es));

Much better.

>> @@ -2160,6 +2162,15 @@
>>  			EXT4_BLOCKS_PER_GROUP(sb) - 1);
>>  	do_div(blocks_count, EXT4_BLOCKS_PER_GROUP(sb));
>>  	sbi->s_groups_count = blocks_count;
>> +	if (sbi->s_groups_count > ((uint64_t)1<<32) - EXT4_DESC_PER_BLOCK(sb)) {
> 
> This can't possibly work, given that s_groups_count is an unsigned
> int.

I'm casting to uint64_t, so in my opinion it should work on all 
architectures.

Kind regards,
Thiemo