MIPS: BCM47XX: Make sure NVRAM buffer ends with \0
authorRafał Miłecki <zajec5@gmail.com>
Tue, 12 May 2015 16:46:11 +0000 (18:46 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 21 Jun 2015 19:52:20 +0000 (21:52 +0200)
This will simplify reading its contents.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Hante Meuleman <meuleman@broadcom.com>
Cc: Ian Kent <raven@themaw.net>
Patchwork: https://patchwork.linux-mips.org/patch/10031/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/bcm47xx/nvram.c

index ba632ff08a13c58838d734a4f5aadce860dffe3c..dee1c32c0b6525fc248f6892ef1ca0821c865f30 100644 (file)
@@ -98,7 +98,7 @@ found:
                pr_err("The nvram size accoridng to the header seems to be bigger than the partition on flash\n");
        if (header->len > NVRAM_SPACE)
                pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
-                      header->len, NVRAM_SPACE);
+                      header->len, NVRAM_SPACE - 1);
 
        src = (u32 *)header;
        dst = (u32 *)nvram_buf;
@@ -106,6 +106,7 @@ found:
                *dst++ = __raw_readl(src++);
        for (; i < header->len && i < NVRAM_SPACE && i < size; i += 4)
                *dst++ = readl(src++);
+       nvram_buf[NVRAM_SPACE - 1] = '\0';
 
        return 0;
 }
@@ -150,10 +151,10 @@ static int nvram_init(void)
                u8 *dst = (uint8_t *)nvram_buf;
                size_t len = header.len;
 
-               if (header.len > NVRAM_SPACE) {
+               if (len >= NVRAM_SPACE) {
+                       len = NVRAM_SPACE - 1;
                        pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n",
-                               header.len, NVRAM_SPACE);
-                       len = NVRAM_SPACE;
+                               header.len, len);
                }
 
                err = mtd_read(mtd, 0, len, &bytes_read, dst);