summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Gang <gang.chen@asianux.com>2013-01-24 12:14:52 +0800
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-11-25 11:50:57 +1100
commite0513d9ea8dd2a7b21b699ada8d59d8afbb8b5b7 (patch)
treed0b5475c65196b3aa07f8f56c63e0a1cbf94be39
parentec67ad82814bee92251fd963bf01c7a173856555 (diff)
downloadlinux-stable-e0513d9ea8dd2a7b21b699ada8d59d8afbb8b5b7.tar.gz
linux-stable-e0513d9ea8dd2a7b21b699ada8d59d8afbb8b5b7.tar.bz2
linux-stable-e0513d9ea8dd2a7b21b699ada8d59d8afbb8b5b7.zip
arch/powerpc/kernel: Use %12.12s instead of %12s to avoid memory overflow
for tmp_part->header.name: it is "Terminating null required only for names < 12 chars". so need to limit the %.12s for it in printk additional info: %12s limit the width, not for the original string output length if name length is more than 12, it still can be fully displayed. if name length is less than 12, the ' ' will be filled before name. %.12s truly limit the original string output length (precision) Signed-off-by: Chen Gang <gang.chen@asianux.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/nvram_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index fd82c289ab1c..28b898e68185 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -210,7 +210,7 @@ static void __init nvram_print_partitions(char * label)
printk(KERN_WARNING "--------%s---------\n", label);
printk(KERN_WARNING "indx\t\tsig\tchks\tlen\tname\n");
list_for_each_entry(tmp_part, &nvram_partitions, partition) {
- printk(KERN_WARNING "%4d \t%02x\t%02x\t%d\t%12s\n",
+ printk(KERN_WARNING "%4d \t%02x\t%02x\t%d\t%12.12s\n",
tmp_part->index, tmp_part->header.signature,
tmp_part->header.checksum, tmp_part->header.length,
tmp_part->header.name);