aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-04-21 22:56:32 -0400
committerTheodore Ts'o <tytso@mit.edu>2013-04-21 22:56:32 -0400
commit3f8a6411fbada1fa482276591e037f3b1adcf55b (patch)
tree1ed53f3cd7e298876f5d8c81c261528ebbe077de
parent7f3e3c7cfcec148ccca9c0dd2dbfd7b00b7ac10f (diff)
ext4: add check for inodes_count overflow in new resize ioctl
Addresses-Red-Hat-Bugzilla: #913245 Reported-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> Cc: stable@vger.kernel.org
-rw-r--r--fs/ext4/resize.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 08d2312c0fd4..b27c96d01965 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1882,6 +1882,10 @@ retry:
1882 return 0; 1882 return 0;
1883 1883
1884 n_group = ext4_get_group_number(sb, n_blocks_count - 1); 1884 n_group = ext4_get_group_number(sb, n_blocks_count - 1);
1885 if (n_group > (0xFFFFFFFFUL / EXT4_INODES_PER_GROUP(sb))) {
1886 ext4_warning(sb, "resize would cause inodes_count overflow");
1887 return -EINVAL;
1888 }
1885 ext4_get_group_no_and_offset(sb, o_blocks_count - 1, &o_group, &offset); 1889 ext4_get_group_no_and_offset(sb, o_blocks_count - 1, &o_group, &offset);
1886 1890
1887 n_desc_blocks = num_desc_blocks(sb, n_group + 1); 1891 n_desc_blocks = num_desc_blocks(sb, n_group + 1);