From patchwork Tue Aug 17 05:11:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1517554 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=GNW0FGqK; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GpfKh5CFjz9sPf for ; Tue, 17 Aug 2021 15:12:24 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B016F82903; Tue, 17 Aug 2021 07:12:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="GNW0FGqK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 489BF829E7; Tue, 17 Aug 2021 07:12:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (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 41D83801FD for ; Tue, 17 Aug 2021 07:12:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1629177123; bh=DrUdz/lC4+hUbc+0GKTPYGdbLuU3fUet0+TzlWZfCzc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=GNW0FGqKEjfXGnJkF3UspEwBaXGE1Yz1NDskEHoAc9iOaKlQgPARfJjEgGCG+x6fY nXNJ3qmUKaue6MqU1lNBc7L4Glx8Rmg/D/Uyhvli1FQ8Sa48SRi1YQvobEadH+iZ9d CfzTfps7jTB9dP8HmVRQlAZ/ncHID1Ezz7CFydOM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([88.152.144.157]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mt757-1n4G7e1IZF-00tU2J; Tue, 17 Aug 2021 07:12:03 +0200 From: Heinrich Schuchardt To: Tom Rini Cc: =?utf-8?q?Marek_Beh=C3=BAn?= , =?utf-8?q?Pali_Roh?= =?utf-8?q?=C3=A1r?= , Stefan Roese , Chris Packham , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] kwbimage: check return value of image_get_csk_index Date: Tue, 17 Aug 2021 07:11:58 +0200 Message-Id: <20210817051158.13283-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:y5Mg1xCahbzakga6lxeWYqGc9rQhvsstTR7Rxi3eFLYTXmWUajY W34lS/8eSUMWdowdaxElIpFKSKr4j39HBLKrwTRU7d6ytVba5/wS5fRBUyCM5U8+MEIOsrg EWt5TA9mWSW8eOBidFnUQ4z9As3Ahr9kpQDoIF0wPe5XcdnDs6Altm5DgA8HViMiCM/XGCa KqU97B4MUF/a1eb60ILRA== X-UI-Out-Filterresults: notjunk:1;V03:K0:IkWP9mh4cLI=:d0p5E2uzE58fNz7miw7F7T vgGXEdtHt35+fnjJN/xfZ4226uc2bLxskj0krQ25NtFS6M5eMdOnqzQ810LMBnCOO7D5Jai4r LqPLHyVF57Q15TZJBf/JiEkNiPYaaMOyI7gAZLMCK/qqzyrzcpLjfz3jmhWyQfz2gd/v0YPuH Glasmuy8vT2d7VIiNvP9x3emBdIJdGrPhbrtlHH0sJAXn4RXeOTm7Y/QFVeWtNkAKSL2dit2E PsmQ06t2IxngNdbILvZhPCSRsz4k5WGzriche50EUh3Col8OEMh6GU4k82LlVKHo4nhAjV1Ac 0MRD2ml++the1rFKNzcI00YqDwEu/WqRut6Cc+dgWLuEbTXlUxIgvrUsYrpwD1qmWOk7sLvv8 1NpD0qJDfEdNJij9GUOy7R36qQcsEp4XhrexebphfbLd+4lVp8oEisfnP/2p2y15nwXikY9KF XTQYloB8GNV6VqYymmJzgKcxJfpFHsb7BjKBordL3/Mbd7AodjJeunr0Y3IMm1qfW6v5hKAL/ nuyP6U/dhu6sP8kDcEAVTz6OJ1LwW0J4H/2Yw3GemCL4VLU+PByPsvyP+90+h14AwWuDw0oHe OaP9pYAh+8OiJmwtbaJ2vGM+2TnWEoOhOp+xy+OiQXMb137BO7b2UgQfzbgEmVmt4BxpLS3yx AzSOUFHaQnqhS+8jrJ312QRe/6QpDU+G4KSiAxFO2wRgNVZd+AHbi5IgBSG3zNTTcORIIeG5G 86A3OChx0IRzW+4+fROjxCqreK/UilvYyVe/aS9Q+eysUW/0duBs9EpbkSJvCxYwa7IXcheBU mSsk0G7WYsvzO3Wh8M4BU2zMHRTjh3CbCyT6zIWiLKNhU36EbtABcHO4NlX6r8dT1vVaA5t/L gHj5Eba9YmG9Ev30EAnCh7EhwPNSxg9fqgbnERJBEfkS4IPZmao5nr2yyMckZn2yyQnTmRo3K Ubzs/RvMdvVGw0n83wgA23UG69JVySJKvlr3zpITQpMkDF1nokXKV92FcvvMv9O2P6ya4+bAN qR+5SNBrPa8ZC6du8sApCJCUOej52wKZBC1y1KmeYPkeU6gDLyM58E+qjm3e3DYAKShCDexHB OdPRdKGSkUOO7smwF2L7v12cnQXM2QBQhLPlGBzmIJaAXZClasU1yu18Q== 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 image_get_csk_index() may return -1 in case of an error. Don't use this value as index. This resolves Coverity CID 338488 Memory - illegal accesses (NEGATIVE_RETURNS) Signed-off-by: Heinrich Schuchardt Reviewed-by: Stefan Roese Reviewed-by: Pali Rohár --- tools/kwbimage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 2a10df773b..bf7fd135ac 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -1087,7 +1087,7 @@ int kwb_sign_csk_with_kak(struct image_tool_params *params, int csk_idx = image_get_csk_index(); struct sig_v1 tmp_sig; - if (csk_idx >= 16) { + if (csk_idx < 0 || csk_idx > 15) { fprintf(stderr, "Invalid CSK index %d\n", csk_idx); return 1; }