Skip to content

Commit

Permalink
reiserfs: fix "new_insert_key may be used uninitialized ..."
Browse files Browse the repository at this point in the history
BugLink: http://bugs.launchpad.net/bugs/1629386

commit 0a11b9a 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
  • Loading branch information
jeffmahoney authored and Seth Forshee committed Oct 20, 2016
1 parent a44d6aa commit 45aa658
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion fs/reiserfs/ibalance.c
Original file line number Diff line number Diff line change
Expand Up @@ -1153,8 +1153,9 @@ int balance_internal(struct tree_balance *tb,
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;
}

0 comments on commit 45aa658

Please sign in to comment.