leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u-boot: remove driver lookup loop from env_save()

Browse Source 
When called with ENVOP_SAVE, env_get_location() only returns the
gd->env_load_location variable without actually checking for
the environment location and priority.

This behaviour causes env_save() to fall into an infinite loop when
the low-level drv->save() call fails.

The env_save() function should not loop through the environment
location list but it should save the environment into the location
stored in gd->env_load_location by the last env_load() call.

Signed-off-by: Nicholas Faustini <nicholas.faustini@azcomtech.com>
Reviewed-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
This commit is contained in:
Nicholas Faustini 2018-07-23 10:01:07 +02:00 committed by Tom Rini
parent b8448051df
commit d30ba2315a
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
env/env.c vendored
View File

@ -119,21 +119,12 @@ static void env_set_inited(enum env_location location)
*/ */
__weak enum env_location env_get_location(enum env_operation op, int prio) __weak enum env_location env_get_location(enum env_operation op, int prio)
{ {
switch (op) { if (prio >= ARRAY_SIZE(env_locations))
case ENVOP_GET_CHAR: return ENVL_UNKNOWN;
case ENVOP_INIT:
case ENVOP_LOAD:
if (prio >= ARRAY_SIZE(env_locations))
return ENVL_UNKNOWN;
gd->env_load_location = env_locations[prio]; gd->env_load_prio = prio;
return gd->env_load_location;
case ENVOP_SAVE: return env_locations[prio];
return gd->env_load_location;
}
return ENVL_UNKNOWN;
} }
@ -205,22 +196,29 @@ int env_load(void)
return 0; return 0;
} }
/*
* In case of invalid environment, we set the 'default' env location
* to the highest priority. In this way, next calls to env_save()
* will restore the environment at the right place.
*/
env_get_location(ENVOP_LOAD, 0);
return -ENODEV; return -ENODEV;
} }
int env_save(void) int env_save(void)
{ {
struct env_driver *drv; struct env_driver *drv;
int prio;
for (prio = 0; (drv = env_driver_lookup(ENVOP_SAVE, prio)); prio++) { drv = env_driver_lookup(ENVOP_SAVE, gd->env_load_prio);
if (drv) {
int ret; int ret;
if (!drv->save) if (!drv->save)
continue; return -ENODEV;
if (!env_has_inited(drv->location)) if (!env_has_inited(drv->location))
continue; return -ENODEV;
printf("Saving Environment to %s... ", drv->name); printf("Saving Environment to %s... ", drv->name);
ret = drv->save(); ret = drv->save();

2
include/asm-generic/global_data.h
View File

@ -50,7 +50,7 @@ typedef struct global_data {
unsigned long env_addr; /* Address of Environment struct */ unsigned long env_addr; /* Address of Environment struct */
unsigned long env_valid; /* Environment valid? enum env_valid */ unsigned long env_valid; /* Environment valid? enum env_valid */
unsigned long env_has_init; /* Bitmask of boolean of struct env_location offsets */ unsigned long env_has_init; /* Bitmask of boolean of struct env_location offsets */
int env_load_location; int env_load_prio; /* Priority of the loaded environment */
unsigned long ram_base; /* Base address of RAM used by U-Boot */ unsigned long ram_base; /* Base address of RAM used by U-Boot */
unsigned long ram_top; /* Top address of RAM used by U-Boot */ unsigned long ram_top; /* Top address of RAM used by U-Boot */