[PATCH u-boot-mvebu v2 21/41] tools: dumpimage: Fix crashing when trying to extract data from kwbimage

[Stefan Roese]

On 19.07.21 14:20, Marek Behún wrote:
> From: Pali Rohár <pali at kernel.org>
> 
> 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 at kernel.org>
> Reviewed-by: Marek Behún <marek.behun at nic.cz>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   tools/kwbimage.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index f3b16d94ad..5410df63f5 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -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);
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de