hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: fa2b4e54d4 ("powerpc/nvram: Improve partition removal")
Signed-off-by: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Pan Xinhui 2015-12-10 15:30:02 +08:00 committed by Michael Ellerman
parent 0d0fecc5b5
commit 11b7e154b1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/nvram_64.c
View File

@ -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,
} }
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;