diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2016-08-02 14:05:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-30 10:12:42 +0200 |
| commit | e3720827a4a94f62f99d6c0ae25de52815de3dbf (patch) | |
| tree | 993ae5b7055a1946aaac08a5ff16ed1b62585c75 /fs | |
| parent | 6c21842b5fc16346a34e81101aff3c224e62bdb5 (diff) | |
| download | lwn-e3720827a4a94f62f99d6c0ae25de52815de3dbf.tar.gz lwn-e3720827a4a94f62f99d6c0ae25de52815de3dbf.zip | |
reiserfs: fix "new_insert_key may be used uninitialized ..."
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/reiserfs/ibalance.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c index b751eea32e20..5db6f45b3fed 100644 --- a/fs/reiserfs/ibalance.c +++ b/fs/reiserfs/ibalance.c @@ -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; } |