From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 25 Sep 2016 13:28:34 +0000 (+0200)
Subject: 4.7-stable patches
X-Git-Tag: v4.7.6~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59cedf91a113c20a52a069aec574e75ae8b6b613;p=thirdparty%2Fkernel%2Fstable-queue.git

4.7-stable patches

added patches:
	reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch
---

diff --git a/queue-4.7/reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch b/queue-4.7/reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch
new file mode 100644
index 00000000000..69391e68c28
--- /dev/null
+++ b/queue-4.7/reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch
@@ -0,0 +1,40 @@
+From 0a11b9aae49adf1f952427ef1a1d9e793dd6ffb6 Mon Sep 17 00:00:00 2001
+From: Jeff Mahoney <jeffm@suse.com>
+Date: Tue, 2 Aug 2016 14:05:33 -0700
+Subject: reiserfs: fix "new_insert_key may be used uninitialized ..."
+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/reiserfs/ibalance.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/fs/reiserfs/ibalance.c
++++ b/fs/reiserfs/ibalance.c
+@@ -1153,8 +1153,9 @@ int balance_internal(struct tree_balance
+ 				       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;
+ }
diff --git a/queue-4.7/series b/queue-4.7/series
new file mode 100644
index 00000000000..b147d08f75d
--- /dev/null
+++ b/queue-4.7/series
@@ -0,0 +1 @@
+reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch