aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-24 14:28:57 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-24 14:28:57 +0000
commit97a0e165a621c8b2d3b2e3e623ee1629166e66ed (patch)
treec1e8d402d36eea72dc1475670eafbd888cbcfc28
parent84a3e668fc852afea25aadf8ee6f04a661fae280 (diff)
downloadupstream-97a0e165a621c8b2d3b2e3e623ee1629166e66ed.tar.gz
upstream-97a0e165a621c8b2d3b2e3e623ee1629166e66ed.tar.bz2
upstream-97a0e165a621c8b2d3b2e3e623ee1629166e66ed.zip
nvram: fix regression in finding NVRAM beginning
The loop was giving up too early as it never expected NVRAM smaller than 0x10000. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45578
-rw-r--r--package/utils/nvram/src/nvram.c7
-rw-r--r--package/utils/nvram/src/nvram.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/package/utils/nvram/src/nvram.c b/package/utils/nvram/src/nvram.c
index 0e1c726837..c4bcb1d4a6 100644
--- a/package/utils/nvram/src/nvram.c
+++ b/package/utils/nvram/src/nvram.c
@@ -364,7 +364,12 @@ nvram_handle_t * nvram_open(const char *file, int rdonly)
if( mmap_area != MAP_FAILED )
{
- for( i = 0; i <= ((nvram_part_size - NVRAM_SPACE) / sizeof(uint32_t)); i++ )
+ /*
+ * Start looking for NVRAM_MAGIC at beginning of MTD
+ * partition. Stop if there is less than NVRAM_MIN_SPACE
+ * to check, that was the lowest used size.
+ */
+ for( i = 0; i <= ((nvram_part_size - NVRAM_MIN_SPACE) / sizeof(uint32_t)); i++ )
{
if( ((uint32_t *)mmap_area)[i] == NVRAM_MAGIC )
{
diff --git a/package/utils/nvram/src/nvram.h b/package/utils/nvram/src/nvram.h
index cd37650860..215d816327 100644
--- a/package/utils/nvram/src/nvram.h
+++ b/package/utils/nvram/src/nvram.h
@@ -113,6 +113,7 @@ char * nvram_find_staging(void);
#define NVRAM_ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y))
/* NVRAM constants */
+#define NVRAM_MIN_SPACE 0x8000
#define NVRAM_SPACE 0x10000
#define NVRAM_MAGIC 0x48534C46 /* 'FLSH' */
#define NVRAM_VERSION 1