From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60533C07E96 for ; Thu, 15 Jul 2021 08:36:01 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A53F86127C for ; Thu, 15 Jul 2021 08:36:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A53F86127C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EE11C82959; Thu, 15 Jul 2021 10:35:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1626338159; bh=l6Z9/N2HuZoDnRjdVnOyNdxIf7WGF/ugEhQxUFUfwC0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Qq0h7GGOKQJn/KtvJ86mXv7l1XyBzmC+BlDjEoE6yS9bBXj9tk2vp1HthutDBALZ0 pgNjcUBnIAxcwugZnY6SJJPQeAm35/EIKVLyzkxFo8uM6G/cI6clFzCOrcNselJ2+g F1bLYZRe6RdrAPYjwUSp3qvO7v5gdd44QNwH0rscLWC9Sndqbh73kjHvRR/3hyTMDW ISJG2zSwK3F1vO60j7vIZgRuMiGaQWgb2KMHzFif9NbAPyyVL4ue7fcUSuKxClfMc8 mbHLvH4laPJN0of4R3DOiACNMNzI6sioaq/pTqTbDn0ndPj9ZTpNUqeCDXBQZXXZxf OBLMm0hlRkZnw== Received: by phobos.denx.de (Postfix, from userid 109) id 9BBCE82952; Thu, 15 Jul 2021 10:35:56 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [IPv6:2001:67c:2050:1::465:107]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E6E4282952 for ; Thu, 15 Jul 2021 10:35:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4GQSPj5B7mzQk9Y; Thu, 15 Jul 2021 10:35:53 +0200 (CEST) Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id mqyxphELrEIb; Thu, 15 Jul 2021 10:35:50 +0200 (CEST) Subject: Re: [PATCH u-boot-mvebu 06/31] tools: kwbimage: Don't crash when binary file name does not contain '/' To: =?UTF-8?Q?Marek_Beh=c3=ban?= , u-boot@lists.denx.de, Chris Packham , Baruch Siach , Dirk Eibach , Chris Packham Cc: Dennis Gilmore , Mario Six , Jon Nettleton , =?UTF-8?Q?Pali_Roh=c3=a1r?= References: <20210708173032.27999-1-marek.behun@nic.cz> <20210708173032.27999-7-marek.behun@nic.cz> From: Stefan Roese Message-ID: <2cb30feb-571c-a531-24eb-3aa3d312fa24@denx.de> Date: Thu, 15 Jul 2021 10:35:50 +0200 MIME-Version: 1.0 In-Reply-To: <20210708173032.27999-7-marek.behun@nic.cz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: X-Rspamd-Score: -5.06 / 15.00 / 15.00 X-Rspamd-Queue-Id: C667118AD X-Rspamd-UID: 6f2421 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean On 08.07.21 19:30, Marek Behún wrote: > From: Pali Rohár > > 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 > Reviewed-by: Marek Behún Reviewed-by: Stefan Roese 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@denx.de