2013-04-22 02:57:05

by Theodore Ts'o

Subject: [PATCH] ext4: add check for inodes_count overflow in new resize ioctl

Addresses-Red-Hat-Bugzilla: #913245

Reported-by: Eric Sandeen <[email protected]>
Signed-off-by: "Theodore Ts'o" <[email protected]>
Cc: [email protected]
---
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

2013-04-22 14:55:45

by Carlos Maiolino

Subject: Re: [PATCH] ext4: add check for inodes_count overflow in new resize ioctl

Looks good.

Reviewed-by: Carlos Maiolino <[email protected]>

On Sun, Apr 21, 2013 at 10:57:05PM -0400, Theodore Ts'o wrote:
> Addresses-Red-Hat-Bugzilla: #913245
>
> Reported-by: Eric Sandeen <[email protected]>
> Signed-off-by: "Theodore Ts'o" <[email protected]>
> Cc: [email protected]
> ---
> 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Carlos