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 5D55BC07E9B for ; Wed, 21 Jul 2021 09:38:56 +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 CEB8261181 for ; Wed, 21 Jul 2021 09:38:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CEB8261181 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 DDA2782C46; Wed, 21 Jul 2021 11:38:53 +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=1626860334; bh=iK75BR/73LZaYBSCNBgq9eoSu4BvH5vgq8CHAtGiZ0E=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=rJcPLJMftO2GfrNyNYh5C7mlbLlbrF19l/cKgeXAUN2j9yjMrs/mj48L/k5+sfJBb RtfVLEtKoQ//kklcwQ6PmqugNAcDTm1ECw6QBaE7DNKaS7u22k+ebdZkrGStJRdMci KRor3shoCqcr6HSSIiTmKl+pMNJ+UB8TqJsTArCNvTLPYiMSzkwJra/esrmkg16QkN gdsYIBfJ2mmiC+HKnAlJwYU1piJjTqffRQbuUAXJDXiI3ce4uxfDGSXwJf/3GZMNm1 ClRtalOq5GvLGyGa+OjBgmsfSfXgvGFk39DCyjDnwQdltQo1jLIe3DV7xF/K0UU/2q GyGB5K8NHbdoQ== Received: by phobos.denx.de (Postfix, from userid 109) id 401A782C30; Wed, 21 Jul 2021 11:38:52 +0200 (CEST) Received: from mout-u-205.mailbox.org (mout-u-205.mailbox.org [91.198.250.254]) (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 CD02682C30 for ; Wed, 21 Jul 2021 11:38:49 +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 smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (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-205.mailbox.org (Postfix) with ESMTPS id 4GV9WY5LqlzQkFt; Wed, 21 Jul 2021 11:38:49 +0200 (CEST) Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id Ul-nrm4b9iIp; Wed, 21 Jul 2021 11:38:46 +0200 (CEST) Subject: Re: [PATCH u-boot-mvebu v2 21/41] tools: dumpimage: Fix crashing when trying to extract data from kwbimage 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: <20210719122104.29698-1-marek.behun@nic.cz> <20210719122104.29698-22-marek.behun@nic.cz> From: Stefan Roese Message-ID: Date: Wed, 21 Jul 2021 11:38:45 +0200 MIME-Version: 1.0 In-Reply-To: <20210719122104.29698-22-marek.behun@nic.cz> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: de-DE Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BACEF1842 X-Rspamd-UID: 31bf01 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 19.07.21 14:20, Marek Behún wrote: > From: Pali Rohár > > 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 > 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 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@denx.de