[Skiboot] [PATCH 3/8] nvram_format: Fix unterminated string warning

[Kamalesh Babulal]

We write NVRAM_NAME_FREE, which is of strlen(12) into
struct chrp_nvram_hdr->name[12] using strncpy. This could
result in an unterminated string.

This patch alters the length of NVRAM_NAME_FREE length 11
and as nvram_image is already memset to zero. Note that the
NVRAM_NAME_FREE is local to this file.

Fixes Coverity defect #97817.

Signed-off-by: Kamalesh Babulal <kamalesh at linux.vnet.ibm.com>
---
 Makefile     | 2 +-
 core/nvram.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 758bbb9..f9b2f04 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ endif
 ifeq ("$(ARCH)", "ppc64")
 	CROSS ?=
 else
-	CROSS ?= powerpc64-linux-
+	CROSS ?= powerpc64-linux-gnu-
 endif
 
 #
diff --git a/core/nvram.c b/core/nvram.c
index f25d6aa..f59fb82 100644
--- a/core/nvram.c
+++ b/core/nvram.c
@@ -63,7 +63,7 @@ struct chrp_nvram_hdr {
 
 #define NVRAM_NAME_COMMON	"common"
 #define NVRAM_NAME_FW_PRIV	"ibm,skiboot"
-#define NVRAM_NAME_FREE		"wwwwwwwwwwww"
+#define NVRAM_NAME_FREE		"wwwwwwwwwww"
 
 /* 64k should be enough, famous last words... */
 #define NVRAM_SIZE_COMMON	0x10000
@@ -117,7 +117,7 @@ static void nvram_format(void)
 	h = nvram_image + offset;
 	h->sig = NVRAM_SIG_FREE;
 	h->len = (nvram_size - offset) >> 4;
-	strncpy(h->name, NVRAM_NAME_FREE, 12);
+	strncpy(h->name, NVRAM_NAME_FREE, 11);
 	h->cksum = chrp_nv_cksum(h);
 
 	/* Write the whole thing back */
-- 
2.1.2