Commit 11b7e154 authored by Pan Xinhui's avatar Pan Xinhui Committed by Michael Ellerman

powerpc/nvram: Fix an incorrect partition merge

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 .

Fixes: fa2b4e54 ("powerpc/nvram: Improve partition removal")
Signed-off-by: default avatarPan Xinhui <xinhui.pan@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 0d0fecc5
...@@ -956,7 +956,7 @@ int __init nvram_remove_partition(const char *name, int sig, ...@@ -956,7 +956,7 @@ int __init nvram_remove_partition(const char *name, int sig,
/* Make partition a free partition */ /* Make partition a free partition */
part->header.signature = NVRAM_SIG_FREE; 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); part->header.checksum = nvram_checksum(&part->header);
rc = nvram_write_header(part); rc = nvram_write_header(part);
if (rc <= 0) { if (rc <= 0) {
...@@ -974,8 +974,8 @@ int __init nvram_remove_partition(const char *name, int sig, ...@@ -974,8 +974,8 @@ int __init nvram_remove_partition(const char *name, int sig,
} }
if (prev) { if (prev) {
prev->header.length += part->header.length; prev->header.length += part->header.length;
prev->header.checksum = nvram_checksum(&part->header); prev->header.checksum = nvram_checksum(&prev->header);
rc = nvram_write_header(part); rc = nvram_write_header(prev);
if (rc <= 0) { if (rc <= 0) {
printk(KERN_ERR "nvram_remove_partition: nvram_write failed (%d)\n", rc); printk(KERN_ERR "nvram_remove_partition: nvram_write failed (%d)\n", rc);
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment