From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicholas Faustini Date: Tue, 10 Jul 2018 14:57:56 +0200 Subject: [U-Boot] [RFC PATCH] u-boot: remove driver lookup loop from env_save() Message-ID: <1531227476-21591-1-git-send-email-nicholas.faustini@azcomtech.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 allows saving the environment into the same location that has been previously loaded. 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 use the previously discovered environment driver once. Signed-off-by: Nicholas Faustini --- env/env.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/env/env.c b/env/env.c index 5c0842a..897d197 100644 --- a/env/env.c +++ b/env/env.c @@ -211,16 +211,16 @@ int env_load(void) int env_save(void) { struct env_driver *drv; - int prio; - for (prio = 0; (drv = env_driver_lookup(ENVOP_SAVE, prio)); prio++) { + drv = env_driver_lookup(ENVOP_SAVE, 0); + if (drv) { int ret; if (!drv->save) - continue; + return -ENODEV; if (!env_has_inited(drv->location)) - continue; + return -ENODEV; printf("Saving Environment to %s... ", drv->name); ret = drv->save(); -- 2.7.4