of_property needs at least two parameters, the path and the property
name. If we supply less, we risk crashes, e.g. by running
of_property -fs /test
Verify we got at least two parameters.
Signed-off-by: Ahmad Fatoum <ahmad@xxxxxx>
---
commands/of_property.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/commands/of_property.c b/commands/of_property.c
index 31e9b71dd7d1..1d7ba181d5f0 100644
--- a/commands/of_property.c
+++ b/commands/of_property.c
@@ -315,7 +315,7 @@ static int do_of_property(int argc, char *argv[])
int delete = 0;
int set = 0;
int fixup = 0;
- char *path = NULL, *propname = NULL;
+ char *path, *propname;
while ((opt = getopt(argc, argv, "dsf")) > 0) {
switch (opt) {
@@ -333,14 +333,11 @@ static int do_of_property(int argc, char *argv[])
}
}
- if (optind == argc)
+ if (argc - optind < 2)
return COMMAND_ERROR_USAGE;
- if (optind < argc)
- path = argv[optind];
-
- if (optind + 1 < argc)
- propname = argv[optind + 1];
+ path = argv[optind];
+ propname = argv[optind + 1];
debug("path: %s propname: %s\n", path, propname);
--
2.20.1
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
