]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
tools: dumpimage: Fix crashing when trying to extract data from kwbimage
authorPali Rohár <pali@kernel.org>
Fri, 23 Jul 2021 09:14:15 +0000 (11:14 +0200)
committerStefan Roese <sr@denx.de>
Sat, 31 Jul 2021 07:49:31 +0000 (09:49 +0200)
Trying to call the following command causes NULL pointer dereference in
strlen():
  ./tools/dumpimage -T kwbimage -o /tmp/out u-boot-spl.kwb

Fix it by checking whether params->imagename is non-NULL before calling
strlen().

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
tools/kwbimage.c

index f3b16d94ad3f6b6e8830b444e6ffa98f9346f785..5410df63f5399239aec8b413f06a9ab2ada4acd3 100644 (file)
@@ -1867,7 +1867,7 @@ static int kwbimage_generate(struct image_tool_params *params,
  */
 static int kwbimage_check_params(struct image_tool_params *params)
 {
-       if (!strlen(params->imagename)) {
+       if (!params->imagename || !strlen(params->imagename)) {
                char *msg = "Configuration file for kwbimage creation omitted";
 
                fprintf(stderr, "Error:%s - %s\n", params->cmdname, msg);