lkml.org 
[lkml]   [2017]   [Feb]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 156/319] reiserfs: fix "new_insert_key may be used uninitialized ..."
    Date
    From: Jeff Mahoney <jeffm@suse.com>

    commit 0a11b9aae49adf1f952427ef1a1d9e793dd6ffb6 upstream.

    new_insert_key only makes any sense when it's associated with a
    new_insert_ptr, which is initialized to NULL and changed to a
    buffer_head when we also initialize new_insert_key. We can key off of
    that to avoid the uninitialized warning.

    Link: http://lkml.kernel.org/r/5eca5ffb-2155-8df2-b4a2-f162f105efed@suse.com
    Signed-off-by: Jeff Mahoney <jeffm@suse.com>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Jan Kara <jack@suse.cz>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    fs/reiserfs/ibalance.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c
    index e1978fd..58cce0c 100644
    --- a/fs/reiserfs/ibalance.c
    +++ b/fs/reiserfs/ibalance.c
    @@ -1082,8 +1082,9 @@ int balance_internal(struct tree_balance *tb, /* tree_balance structure
    insert_ptr);
    }

    - memcpy(new_insert_key_addr, &new_insert_key, KEY_SIZE);
    insert_ptr[0] = new_insert_ptr;
    + if (new_insert_ptr)
    + memcpy(new_insert_key_addr, &new_insert_key, KEY_SIZE);

    return order;
    }
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2017-02-05 21:06    [W:2.395 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site