Skip to contentSkip to conversation

Patch "reiserfs: fix "new_insert_key may be used uninitialized ..."" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Sep 25, 2016 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

reiserfs: fix "new_insert_key may be used uninitialized ..."

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0a11b9aae49adf1f952427ef1a1d9e793dd6ffb6 Mon Sep 17 00:00:00 2001

From: Jeff Mahoney <[email protected]>
Date: Tue, 2 Aug 2016 14:05:33 -0700
Subject: reiserfs: fix "new_insert_key may be used uninitialized ..."

From: Jeff Mahoney <[email protected]>

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.

---
 fs/reiserfs/ibalance.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/reiserfs/ibalance.c +2 -1
@@ -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;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/reiserfs-fix-new_insert_key-may-be-used-uninitialized.patch