lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 003/105] hfs: prevent crash on exit from failed search
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Ernesto A. Fernández" <ernesto.mnd.fernandez@gmail.com>

    [ Upstream commit dc2572791d3a41bab94400af2b6bca9d71ccd303 ]

    hfs_find_exit() expects fd->bnode to be NULL after a search has failed.
    hfs_brec_insert() may instead set it to an error-valued pointer. Fix
    this to prevent a crash.

    Link: http://lkml.kernel.org/r/53d9749a029c41b4016c495fc5838c9dba3afc52.1530294815.git.ernesto.mnd.fernandez@gmail.com
    Signed-off-by: Ernesto A. Fernández <ernesto.mnd.fernandez@gmail.com>
    Cc: Anatoly Trosinenko <anatoly.trosinenko@gmail.com>
    Cc: Viacheslav Dubeyko <slava@dubeyko.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    fs/hfs/brec.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- a/fs/hfs/brec.c
    +++ b/fs/hfs/brec.c
    @@ -74,9 +74,10 @@ int hfs_brec_insert(struct hfs_find_data
    if (!fd->bnode) {
    if (!tree->root)
    hfs_btree_inc_height(tree);
    - fd->bnode = hfs_bnode_find(tree, tree->leaf_head);
    - if (IS_ERR(fd->bnode))
    - return PTR_ERR(fd->bnode);
    + node = hfs_bnode_find(tree, tree->leaf_head);
    + if (IS_ERR(node))
    + return PTR_ERR(node);
    + fd->bnode = node;
    fd->record = -1;
    }
    new_node = NULL;

    \
     
     \ /
      Last update: 2018-09-24 13:47    [W:4.103 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site