ext2: Use kvmalloc() for group descriptor array
authorJan Kara <jack@suse.cz>
Wed, 14 Sep 2022 15:29:33 +0000 (17:29 +0200)
committerJan Kara <jack@suse.cz>
Mon, 26 Sep 2022 12:59:52 +0000 (14:59 +0200)
Array of group descriptor block buffers can get rather large. In theory
in can reach 1MB for perfectly valid filesystem and even more for
maliciously crafted ones. Use kvmalloc() to allocate the array to avoid
straining memory allocator with large order allocations unnecessarily.

Reported-by: syzbot+0f2f7e65a3007d39539f@syzkaller.appspotmail.com
Signed-off-by: Jan Kara <jack@suse.cz>
fs/ext2/super.c

index afb31af..03f2af9 100644 (file)
@@ -163,7 +163,7 @@ static void ext2_put_super (struct super_block * sb)
        db_count = sbi->s_gdb_count;
        for (i = 0; i < db_count; i++)
                brelse(sbi->s_group_desc[i]);
-       kfree(sbi->s_group_desc);
+       kvfree(sbi->s_group_desc);
        kfree(sbi->s_debts);
        percpu_counter_destroy(&sbi->s_freeblocks_counter);
        percpu_counter_destroy(&sbi->s_freeinodes_counter);
@@ -1092,7 +1092,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
        }
        db_count = (sbi->s_groups_count + EXT2_DESC_PER_BLOCK(sb) - 1) /
                   EXT2_DESC_PER_BLOCK(sb);
-       sbi->s_group_desc = kmalloc_array(db_count,
+       sbi->s_group_desc = kvmalloc_array(db_count,
                                           sizeof(struct buffer_head *),
                                           GFP_KERNEL);
        if (sbi->s_group_desc == NULL) {
@@ -1218,7 +1218,7 @@ failed_mount2:
        for (i = 0; i < db_count; i++)
                brelse(sbi->s_group_desc[i]);
 failed_mount_group_desc:
-       kfree(sbi->s_group_desc);
+       kvfree(sbi->s_group_desc);
        kfree(sbi->s_debts);
 failed_mount:
        brelse(bh);