lkml.org 
[lkml]   [2019]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 42/46] Revert "jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()"
    Date
    From: Joel Stanley <joel@jms.id.au>

    commit 6e78c01fde9023e0701f3af880c1fd9de6e4e8e3 upstream.

    This reverts commit f2538f999345405f7d2e1194c0c8efa4e11f7b3a. The patch
    stopped JFFS2 from being able to mount an existing filesystem with the
    following errors:

    jffs2: error: (77) jffs2_build_inode_fragtree: Add node to tree failed -22
    jffs2: error: (77) jffs2_do_read_inode_internal: Failed to build final fragtree for inode #5377: error -22

    Fixes: f2538f999345 ("jffs2: Fix possible null-pointer dereferences...")
    Cc: stable@vger.kernel.org
    Suggested-by: Hou Tao <houtao1@huawei.com>
    Signed-off-by: Joel Stanley <joel@jms.id.au>
    Signed-off-by: Richard Weinberger <richard@nod.at>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/jffs2/nodelist.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/fs/jffs2/nodelist.c
    +++ b/fs/jffs2/nodelist.c
    @@ -226,7 +226,7 @@ static int jffs2_add_frag_to_fragtree(st
    lastend = this->ofs + this->size;
    } else {
    dbg_fragtree2("lookup gave no frag\n");
    - return -EINVAL;
    + lastend = 0;
    }

    /* See if we ran off the end of the fragtree */

    \
     
     \ /
      Last update: 2019-12-03 23:39    [W:4.160 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site