lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 411/434] ext4: check for directory entries too close to block end
    Date
    From: Jan Kara <jack@suse.cz>

    commit 109ba779d6cca2d519c5dd624a3276d03e21948e upstream.

    ext4_check_dir_entry() currently does not catch a case when a directory
    entry ends so close to the block end that the header of the next
    directory entry would not fit in the remaining space. This can lead to
    directory iteration code trying to access address beyond end of current
    buffer head leading to oops.

    CC: stable@vger.kernel.org
    Signed-off-by: Jan Kara <jack@suse.cz>
    Link: https://lore.kernel.org/r/20191202170213.4761-3-jack@suse.cz
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ext4/dir.c | 5 +++++
    1 file changed, 5 insertions(+)

    --- a/fs/ext4/dir.c
    +++ b/fs/ext4/dir.c
    @@ -81,6 +81,11 @@ int __ext4_check_dir_entry(const char *f
    error_msg = "rec_len is too small for name_len";
    else if (unlikely(((char *) de - buf) + rlen > size))
    error_msg = "directory entry overrun";
    + else if (unlikely(((char *) de - buf) + rlen >
    + size - EXT4_DIR_REC_LEN(1) &&
    + ((char *) de - buf) + rlen != size)) {
    + error_msg = "directory entry too close to block end";
    + }
    else if (unlikely(le32_to_cpu(de->inode) >
    le32_to_cpu(EXT4_SB(dir->i_sb)->s_es->s_inodes_count)))
    error_msg = "inode out of bounds";

    \
     
     \ /
      Last update: 2019-12-29 18:58    [W:3.267 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site