| Message ID | 1366599425-11561-1-git-send-email-tytso@mit.edu |
|---|---|
| State | Accepted, archived |
| Headers | show |
Looks good. Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> On Sun, Apr 21, 2013 at 10:57:05PM -0400, Theodore Ts'o wrote: > Addresses-Red-Hat-Bugzilla: #913245 > > Reported-by: Eric Sandeen <sandeen@redhat.com> > Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> > Cc: stable@vger.kernel.org > --- > fs/ext4/resize.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c > index 08d2312..b27c96d 100644 > --- a/fs/ext4/resize.c > +++ b/fs/ext4/resize.c > @@ -1882,6 +1882,10 @@ retry: > return 0; > > n_group = ext4_get_group_number(sb, n_blocks_count - 1); > + 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.12.rc0.22.gcdd159b > > -- > To unsubscribe from this list: send the line "unsubscribe linux-ext4" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 08d2312..b27c96d 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -1882,6 +1882,10 @@ retry: return 0; n_group = ext4_get_group_number(sb, n_blocks_count - 1); + 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);
Addresses-Red-Hat-Bugzilla: #913245 Reported-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: stable@vger.kernel.org --- fs/ext4/resize.c | 4 ++++ 1 file changed, 4 insertions(+)