lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 590/717] ext4: fix an IS_ERR() vs NULL check
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit bc18546bf68e47996a359d2533168d5770a22024 upstream.

    The ext4_find_extent() function never returns NULL, it returns error
    pointers.

    Fixes: 44059e503b03 ("ext4: fast commit recovery path")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Jan Kara <jack@suse.cz>
    Link: https://lore.kernel.org/r/20201023112232.GB282278@mwanda
    Signed-off-by: Theodore Ts'o <tytso@mit.edu>
    Cc: stable@kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/ext4/extents.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/fs/ext4/extents.c
    +++ b/fs/ext4/extents.c
    @@ -5815,8 +5815,8 @@ int ext4_ext_replay_update_ex(struct ino
    int ret;

    path = ext4_find_extent(inode, start, NULL, 0);
    - if (!path)
    - return -EINVAL;
    + if (IS_ERR(path))
    + return PTR_ERR(path);
    ex = path[path->p_depth].p_ext;
    if (!ex) {
    ret = -EFSCORRUPTED;

    \
     
     \ /
      Last update: 2020-12-28 15:29    [W:4.035 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site