Commit c0ac3339 authored by Ladislav Michl's avatar Ladislav Michl Committed by Tom Rini

cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init

A private buffer is used to read mtdparts variable from non-relocated
environment. A pointer to that buffer is returned unconditionally,
confusing later test for variable presence in the environment.
Fix it by returning NULL when getenv_f fails.
Signed-off-by: default avatarLadislav Michl <>
parent 52486927
......@@ -1720,11 +1720,13 @@ int mtdparts_init(void)
* before the env is relocated, then we need to use our own stack
* buffer. gd->env_buf will be too small.
if (gd->flags & GD_FLG_ENV_READY) {
if (gd->flags & GD_FLG_ENV_READY)
parts = getenv("mtdparts");
} else {
parts = tmp_parts;
getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN);
else {
if (getenv_f("mtdparts", tmp_parts, MTDPARTS_MAXLEN) != -1)
parts = tmp_parts;
parts = NULL;
current_partition = getenv("partition");
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment