[PATCH 3.12 02/84] reiserfs: fix "new_insert_key may be used uninitialized ..."

From	Jiri Slaby <jslaby@suse.cz>
Newsgroups	linux.kernel
Subject	[PATCH 3.12 02/84] reiserfs: fix "new_insert_key may be used uninitialized ..."
Date	2016-10-17 10:20 +0200
Message-ID	<stbjk-YS-25@gated-at.bofh.it> (permalink)
References	<staZY-A3-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Jeff Mahoney <jeffm@suse.com>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

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: Jiri Slaby <jslaby@suse.cz>
---
 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 e1978fd895f5..58cce0c606f1 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.10.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.12 02/84] reiserfs: fix "new_insert_key may be used uninitialized ..." Jiri Slaby <jslaby@suse.cz> - 2016-10-17 10:20 +0200

csiph-web