]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ext4: fix potential integer overflow
authorInsu Yun <wuninsu@gmail.com>
Fri, 12 Feb 2016 06:15:59 +0000 (01:15 -0500)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:45:02 +0000 (15:45 -0700)
Orabug: 23330858

[ Upstream commit 46901760b46064964b41015d00c140c83aa05bcf ]

Since sizeof(ext_new_group_data) > sizeof(ext_new_flex_group_data),
integer overflow could be happened.
Therefore, need to fix integer overflow sanitization.

Cc: stable@vger.kernel.org
Signed-off-by: Insu Yun <wuninsu@gmail.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 9d7679794e9cd701890d997a76024b2239f90638)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
fs/ext4/resize.c

index cf0c472047e3a89a84e262c7eeddd7ca72fd1b8c..0e783b9f70071be3820efb5a19fad39e23fe8854 100644 (file)
@@ -198,7 +198,7 @@ static struct ext4_new_flex_group_data *alloc_flex_gd(unsigned long flexbg_size)
        if (flex_gd == NULL)
                goto out3;
 
-       if (flexbg_size >= UINT_MAX / sizeof(struct ext4_new_flex_group_data))
+       if (flexbg_size >= UINT_MAX / sizeof(struct ext4_new_group_data))
                goto out2;
        flex_gd->count = flexbg_size;