summaryrefslogtreecommitdiff
path: root/common/env_nvram.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-04-05 14:55:21 -0400
committerTom Rini <trini@ti.com>2013-04-05 14:55:21 -0400
commitcd0f4fa1ca2901312ae78bc27d4edc8286fcbf1d (patch)
tree244e08cd2c8702c9c6c5854eece41377716dbd31 /common/env_nvram.c
parentbc5fd908d976cfd898e8cbb591e7220ddc8a684a (diff)
downloadu-boot-imx-cd0f4fa1ca2901312ae78bc27d4edc8286fcbf1d.zip
u-boot-imx-cd0f4fa1ca2901312ae78bc27d4edc8286fcbf1d.tar.gz
u-boot-imx-cd0f4fa1ca2901312ae78bc27d4edc8286fcbf1d.tar.bz2
Revert "env: fix potential stack overflow in environment functions"
Wolfgang requested this be reverted and Rob agreed after further discussion. This was a symptom of a larger problem we need to deal with. This reverts commit 60d7d5a63189c9f77a190c9965861dc15482c2d0. Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'common/env_nvram.c')
-rw-r--r--common/env_nvram.c26
1 files changed, 10 insertions, 16 deletions
diff --git a/common/env_nvram.c b/common/env_nvram.c
index ff74a6c..eab0e7b 100644
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -60,10 +60,6 @@ env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
char *env_name_spec = "NVRAM";
#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-static char env_buf[CONFIG_ENV_SIZE];
-#endif
-
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
uchar env_get_char_spec(int index)
{
uchar c;
@@ -76,38 +72,36 @@ uchar env_get_char_spec(int index)
void env_relocate_spec(void)
{
- char *buf;
+ char buf[CONFIG_ENV_SIZE];
#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
- buf = env_buf;
nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
#else
- buf = (void *)CONFIG_ENV_ADDR;
+ memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
#endif
env_import(buf, 1);
}
int saveenv(void)
{
-#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
- env_t *env_new = (env_t *)env_buf;
-#else
- env_t *env_new = (env_t *)CONFIG_ENV_ADDR;
-#endif
+ env_t env_new;
ssize_t len;
char *res;
int rcode = 0;
- res = (char *)env_new->data;
+ res = (char *)&env_new.data;
len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
if (len < 0) {
error("Cannot export environment: errno = %d\n", errno);
return 1;
}
- env_new->crc = crc32(0, env_new->data, ENV_SIZE);
+ env_new.crc = crc32(0, env_new.data, ENV_SIZE);
#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
- nvram_write(CONFIG_ENV_ADDR, env_new, CONFIG_ENV_SIZE);
+ nvram_write(CONFIG_ENV_ADDR, &env_new, CONFIG_ENV_SIZE);
+#else
+ if (memcpy((char *)CONFIG_ENV_ADDR, &env_new, CONFIG_ENV_SIZE) == NULL)
+ rcode = 1;
#endif
return rcode;
}
@@ -121,7 +115,7 @@ int env_init(void)
{
#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
ulong crc;
- uchar *data = env_buf;
+ uchar data[ENV_SIZE];
nvram_read(&crc, CONFIG_ENV_ADDR, sizeof(ulong));
nvram_read(data, CONFIG_ENV_ADDR + sizeof(ulong), ENV_SIZE);