Skip to contentSkip to conversation

cmd: nvedit: Forbid environment key to be empty.

RFC PATCH Superseded Francis Laniel 1 participant 2 messages Jun 28, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover cmd: nvedit: Forbid environment key to be empty.

Hi.

First of all, I hope you are fine and the same for your relatives.

In this patch, I modified the setenv command to decline empty variable name.
Indeed, it was strangely possible to give the following to this command:
setenv '' foo
Which results in the following belonging to environment:
=foo
And which in turns leads to problem while rebooting:
Loading Environment from Flash... Cannot import environment: errno = 22 *** Warning - import failed, using default environment
This error message is due to varname being empty and was added in [1].

With this patch, executing the above command will lead to the following being printed:
## Error: variable name cannot be empty
And the environment will not be changed.

Here is the diffstat for this patch:
Francis Laniel (1):
cmd: nvedit: Forbid key to be empty.

 cmd/nvedit.c | 5 +++++
 1 file changed, 5 insertions(+)

If you see any way to improve the patch, feel free to share it.

Best regards.

---
[1] https://u-boot.denx.narkive.com/P4aKxVFu/patch-env-don-t-add-an-empty-key-to-the-env-hashtable

--
2.25.1

#1 lore raw

RFC PATCH 1/1 cmd: nvedit: Forbid key to be empty.

Before this patch, it was possible to do the following using setenv:
setenv '' foo
Then, on next reboot, U-Boot will not be able to parse environment due to it having:
=foo

Now, if the above command is given, an error message is thrown and environment is not modified.

---
 cmd/nvedit.c | 5 +++++
 1 file changed, 5 insertions(+)
cmd/nvedit.c +5 -0
index d14ba10cef..64b7aef78d 100644
@@ -262,6 +262,11 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag)
 		return 1;
 	}
 
+	if (!strlen(name)) {
+		printf("## Error: variable name cannot be empty\n");
+		return 1;
+	}
+
 	env_id++;
 
 	/* Delete only ? */
Signature · 1 line
2.25.1