lkml.org 
[lkml]   [2017]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 005/268] ext4: add sanity checking to count_overhead()
    Date
    From: Theodore Ts'o <tytso@mit.edu>

    commit c48ae41bafe31e9a66d8be2ced4e42a6b57fa814 upstream.

    The commit "ext4: sanity check the block and cluster size at mount
    time" should prevent any problems, but in case the superblock is
    modified while the file system is mounted, add an extra safety check
    to make sure we won't overrun the allocated buffer.

    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    fs/ext4/super.c | 11 ++++++++---
    1 file changed, 8 insertions(+), 3 deletions(-)

    diff --git a/fs/ext4/super.c b/fs/ext4/super.c
    index f11efda..d609efd 100644
    --- a/fs/ext4/super.c
    +++ b/fs/ext4/super.c
    @@ -3185,10 +3185,15 @@ static int count_overhead(struct super_block *sb, ext4_group_t grp,
    ext4_set_bit(s++, buf);
    count++;
    }
    - for (j = ext4_bg_num_gdb(sb, grp); j > 0; j--) {
    - ext4_set_bit(EXT4_B2C(sbi, s++), buf);
    - count++;
    + j = ext4_bg_num_gdb(sb, grp);
    + if (s + j > EXT4_BLOCKS_PER_GROUP(sb)) {
    + ext4_error(sb, "Invalid number of block group "
    + "descriptor blocks: %d", j);
    + j = EXT4_BLOCKS_PER_GROUP(sb) - s;
    }
    + count += j;
    + for (; j > 0; j--)
    + ext4_set_bit(EXT4_B2C(sbi, s++), buf);
    }
    if (!count)
    return 0;
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-06-19 21:17    [W:2.675 / U:0.188 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site