aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o2013-04-21 21:56:32 -0500
committerGreg Kroah-Hartman2013-05-11 15:53:57 -0500
commit8f6aad0d018d11878d49603e017d3f6480488f41 (patch)
treef28ccf9bacfe4e1e4cd1cf59fc61e67d49b3f333
parent6be0e000f32e975c79852d2d990a09cad41fc605 (diff)
downloadkernel-omap-8f6aad0d018d11878d49603e017d3f6480488f41.tar.gz
kernel-omap-8f6aad0d018d11878d49603e017d3f6480488f41.tar.xz
kernel-omap-8f6aad0d018d11878d49603e017d3f6480488f41.zip
ext4: add check for inodes_count overflow in new resize ioctl
commit 3f8a6411fbada1fa482276591e037f3b1adcf55b upstream. 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> Signed-off-by: Lingzhu Xiang <lxiang@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 a2fe9f53e59b..0cfa2f45abc1 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1880,6 +1880,10 @@ retry:
1880 return 0; 1880 return 0;
1881 1881
1882 ext4_get_group_no_and_offset(sb, n_blocks_count - 1, &n_group, &offset); 1882 ext4_get_group_no_and_offset(sb, n_blocks_count - 1, &n_group, &offset);
1883 if (n_group > (0xFFFFFFFFUL / EXT4_INODES_PER_GROUP(sb))) {
1884 ext4_warning(sb, "resize would cause inodes_count overflow");
1885 return -EINVAL;
1886 }
1883 ext4_get_group_no_and_offset(sb, o_blocks_count - 1, &o_group, &offset); 1887 ext4_get_group_no_and_offset(sb, o_blocks_count - 1, &o_group, &offset);
1884 1888
1885 n_desc_blocks = num_desc_blocks(sb, n_group + 1); 1889 n_desc_blocks = num_desc_blocks(sb, n_group + 1);