[PATCH u-boot-mvebu 06/31] tools: kwbimage: Don't crash when binary file name does not contain '/'

[Stefan Roese]

On 08.07.21 19:30, Marek Behún wrote:
> From: Pali Rohár <pali at kernel.org>
> 
> In the case when the file name is specified relative to the current
> working directory, it does not contain '/' character and strrchr()
> returns NULL.
> 
> The following strcmp() function then crashes on NULL pointer
> dereference.
> 
> 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 44bf5ee026..c08fb678d4 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -1277,7 +1277,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
>   	if (e) {
>   		char *s = strrchr(e->binary.file, '/');
>   
> -		if (strcmp(s, "/binary.0") == 0)
> +		if (s && strcmp(s, "/binary.0") == 0)
>   			main_hdr->destaddr = cpu_to_le32(params->addr);
>   	}
>   
> 


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