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

cmd: mtdparts: fix mtdparts variable presence confusion in mtdparts_init

Browse Source 
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: Ladislav Michl <ladis@linux-mips.org>
This commit is contained in:
Ladislav Michl 2016-07-12 20:28:22 +02:00 committed by Tom Rini
parent 52486927e7
commit c0ac333947
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/mtdparts.c
View File

@ -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;
else
parts = NULL;
}
current_partition = getenv("partition");