commit 3f8a6411fbada1fa482276591e037f3b1adcf55b upstream. Backported for 3.8 and 3.9-stable. Reverted ext4_get_group_number in bd86298. From: Theodore Ts'o <tytso@xxxxxxx> Addresses-Red-Hat-Bugzilla: #913245 Reported-by: Eric Sandeen <sandeen@xxxxxxxxxx> Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx> Reviewed-by: Carlos Maiolino <cmaiolino@xxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Lingzhu Xiang <lxiang@xxxxxxxxxx> diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 1357260..3beae6a 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1882,6 +1882,10 @@ retry: return 0; ext4_get_group_no_and_offset(sb, n_blocks_count - 1, &n_group, &offset); + if (n_group > (0xFFFFFFFFUL / EXT4_INODES_PER_GROUP(sb))) { + ext4_warning(sb, "resize would cause inodes_count overflow"); + return -EINVAL; + } ext4_get_group_no_and_offset(sb, o_blocks_count - 1, &o_group, &offset); n_desc_blocks = num_desc_blocks(sb, n_group + 1); -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html