Commit f1fa3342 authored by Roel Kluin's avatar Roel Kluin Committed by Theodore Ts'o

ext4: fix hot spins in mballoc after err_freebuddy and err_freemeta

In ext4_mb_init_backend() 'i' is of type ext4_group_t. Since unsigned, i
>= 0 is always true, so fix hot spins after err_freebuddy: and -meta:
and prevent decrements when zero.
Signed-off-by: default avatarRoel Kluin <12o3l@tiscali.nl>
Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent f8a87d89
...@@ -2272,13 +2272,13 @@ static int ext4_mb_init_backend(struct super_block *sb) ...@@ -2272,13 +2272,13 @@ static int ext4_mb_init_backend(struct super_block *sb)
meta_group_info[j] = kzalloc(len, GFP_KERNEL); meta_group_info[j] = kzalloc(len, GFP_KERNEL);
if (meta_group_info[j] == NULL) { if (meta_group_info[j] == NULL) {
printk(KERN_ERR "EXT4-fs: can't allocate buddy mem\n"); printk(KERN_ERR "EXT4-fs: can't allocate buddy mem\n");
i--;
goto err_freebuddy; goto err_freebuddy;
} }
desc = ext4_get_group_desc(sb, i, NULL); desc = ext4_get_group_desc(sb, i, NULL);
if (desc == NULL) { if (desc == NULL) {
printk(KERN_ERR printk(KERN_ERR
"EXT4-fs: can't read descriptor %lu\n", i); "EXT4-fs: can't read descriptor %lu\n", i);
i++;
goto err_freebuddy; goto err_freebuddy;
} }
memset(meta_group_info[j], 0, len); memset(meta_group_info[j], 0, len);
...@@ -2318,13 +2318,11 @@ static int ext4_mb_init_backend(struct super_block *sb) ...@@ -2318,13 +2318,11 @@ static int ext4_mb_init_backend(struct super_block *sb)
return 0; return 0;
err_freebuddy: err_freebuddy:
while (i >= 0) { while (i-- > 0)
kfree(ext4_get_group_info(sb, i)); kfree(ext4_get_group_info(sb, i));
i--;
}
i = num_meta_group_infos; i = num_meta_group_infos;
err_freemeta: err_freemeta:
while (--i >= 0) while (i-- > 0)
kfree(sbi->s_group_info[i]); kfree(sbi->s_group_info[i]);
iput(sbi->s_buddy_cache); iput(sbi->s_buddy_cache);
err_freesgi: err_freesgi:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment