summaryrefslogtreecommitdiff
path: root/common/env_sf.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_sf.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_sf.c')
-rw-r--r--common/env_sf.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/common/env_sf.c b/common/env_sf.c
index 9a592ba..d9e9085 100644
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -58,12 +58,11 @@ DECLARE_GLOBAL_DATA_PTR;
char *env_name_spec = "SPI Flash";
static struct spi_flash *env_flash;
-static char env_buf[CONFIG_ENV_SIZE];
#if defined(CONFIG_ENV_OFFSET_REDUND)
int saveenv(void)
{
- env_t *env_new = (env_t *)env_buf;
+ env_t env_new;
ssize_t len;
char *res, *saved_buffer = NULL, flag = OBSOLETE_FLAG;
u32 saved_size, saved_offset, sector = 1;
@@ -79,14 +78,14 @@ int saveenv(void)
}
}
- 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->flags = ACTIVE_FLAG;
+ env_new.crc = crc32(0, env_new.data, ENV_SIZE);
+ env_new.flags = ACTIVE_FLAG;
if (gd->env_valid == 1) {
env_new_offset = CONFIG_ENV_OFFSET_REDUND;
@@ -126,7 +125,7 @@ int saveenv(void)
puts("Writing to SPI flash...");
ret = spi_flash_write(env_flash, env_new_offset,
- CONFIG_ENV_SIZE, env_new);
+ CONFIG_ENV_SIZE, &env_new);
if (ret)
goto done;
@@ -138,7 +137,7 @@ int saveenv(void)
}
ret = spi_flash_write(env_flash, env_offset + offsetof(env_t, flags),
- sizeof(env_new->flags), &flag);
+ sizeof(env_new.flags), &flag);
if (ret)
goto done;
@@ -244,7 +243,7 @@ int saveenv(void)
u32 saved_size, saved_offset, sector = 1;
char *res, *saved_buffer = NULL;
int ret = 1;
- env_t *env_new = (env_t *)env_buf;
+ env_t env_new;
ssize_t len;
if (!env_flash) {
@@ -277,13 +276,13 @@ int saveenv(void)
sector++;
}
- 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);
goto done;
}
- env_new->crc = crc32(0, env_new->data, ENV_SIZE);
+ env_new.crc = crc32(0, env_new.data, ENV_SIZE);
puts("Erasing SPI flash...");
ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET,
@@ -293,7 +292,7 @@ int saveenv(void)
puts("Writing to SPI flash...");
ret = spi_flash_write(env_flash, CONFIG_ENV_OFFSET,
- CONFIG_ENV_SIZE, env_new);
+ CONFIG_ENV_SIZE, &env_new);
if (ret)
goto done;
@@ -316,7 +315,7 @@ int saveenv(void)
void env_relocate_spec(void)
{
- char *buf = env_buf;
+ char buf[CONFIG_ENV_SIZE];
int ret;
env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,