Patch "powerpc/nvram: Fix an incorrect partition merge" has been added to the 4.8-stable tree

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

powerpc/nvram: Fix an incorrect partition merge

to the 4.8-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:
powerpc-nvram-fix-an-incorrect-partition-merge.patch
and it can be found in the queue-4.8 subdirectory.

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

From: Pan Xinhui <[email protected]>
Date: Thu, 10 Dec 2015 15:30:02 +0800
Subject: powerpc/nvram: Fix an incorrect partition merge

From: Pan Xinhui <[email protected]>

commit 11b7e154b132232535befe51c55db048069c8461 upstream.

When we merge two contiguous partitions whose signatures are marked NVRAM_SIG_FREE, We need update prev's length and checksum, then write it to nvram, not cur's. So lets fix this mistake now.

Also use memset instead of strncpy to set the partition's name. It's more readable if we want to fill up with duplicate chars .

---
 arch/powerpc/kernel/nvram_64.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

@@ -956,7 +956,7 @@ int __init nvram_remove_partition(const
 
 		/* Make partition a free partition */
 		part->header.signature = NVRAM_SIG_FREE;
-		strncpy(part->header.name, "wwwwwwwwwwww", 12);
+		memset(part->header.name, 'w', 12);
 		part->header.checksum = nvram_checksum(&part->header);
 		rc = nvram_write_header(part);
 		if (rc <= 0) {

@@ -974,8 +974,8 @@ int __init nvram_remove_partition(const
 		}
 		if (prev) {
 			prev->header.length += part->header.length;
-			prev->header.checksum = nvram_checksum(&part->header);
-			rc = nvram_write_header(part);
+			prev->header.checksum = nvram_checksum(&prev->header);
+			rc = nvram_write_header(prev);
 			if (rc <= 0) {
 				printk(KERN_ERR "nvram_remove_partition: nvram_write failed (%d)\n", rc);
 				return rc;

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

queue-4.8/powerpc-nvram-fix-an-incorrect-partition-merge.patch