linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

Revert "env: fix potential stack overflow in environment functions"

Browse Source 
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 60d7d5a631.

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini
2013-04-05 14:55:21 -04:00
parent bc5fd908d9
commit cd0f4fa1ca
8 changed files with 63 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/env_dataflash.c
View File

@ -30,7 +30,6 @@ DECLARE_GLOBAL_DATA_PTR;
env_t *env_ptr;
char *env_name_spec = "dataflash";
static char env_buf[CONFIG_ENV_SIZE];
uchar env_get_char_spec(int index)
{
@ -43,9 +42,11 @@ uchar env_get_char_spec(int index)
void env_relocate_spec(void)
{
read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, env_buf);
char buf[CONFIG_ENV_SIZE];
env_import(env_buf, 1);
read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, buf);
env_import(buf, 1);
}
#ifdef CONFIG_ENV_OFFSET_REDUND
@ -54,20 +55,20 @@ void env_relocate_spec(void)
int saveenv(void)
{
env_t *env_new = (env_t *)env_buf;
env_t env_new;
ssize_t len;
char *res;
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);
return write_dataflash(CONFIG_ENV_ADDR,
(unsigned long)env_new,
(unsigned long)&env_new,
CONFIG_ENV_SIZE);
}