Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 01A4FC4332F for ; Tue, 22 Nov 2022 09:34:40 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C0F2284E3A; Tue, 22 Nov 2022 10:34:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FDUz8Ixn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A847984F77; Tue, 22 Nov 2022 10:34:36 +0100 (CET) Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6144D84C47 for ; Tue, 22 Nov 2022 10:34:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilin.mikhail.ol@gmail.com Received: by mail-lf1-x129.google.com with SMTP id g12so22746662lfh.3 for ; Tue, 22 Nov 2022 01:34:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p0HqNteCxLuMA8farbRt+oVo907kpJdRGoC+6f3p2Wg=; b=FDUz8IxnIESN4s0Gi+rJN5kwMrMqauYWMeCiQcpHZ34YjPbMtMkBgsStDulIbUyBbf 0UdQnc0tXl8MlKGWw7FxfbKYX+IfM/JqORssBOoX0OaUoCnp/9b+kvkhHrQMBVmeKyAx uUaOIJjlOF+6DKI4p0wjAJEa8K/gxvF8l2spbrgbN4iQ5iEpFVd7BPnhcxGRyW29FCf7 hEU+Gk0PHbzMQvTHT29fiEn8qgST3FDi7SaaW5WwykTjnfKXgyFrGcgnMOvRfu5q+yQ7 kDzrS9wxMgCnWFaPEjF+XAJkb01g6RkqpiJ/tnwXq83B+sQTE1xmSxnKom8s4b/nrnRF QIjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p0HqNteCxLuMA8farbRt+oVo907kpJdRGoC+6f3p2Wg=; b=wlc+en3VWSA20Fmz/UY+vmzB5I+YM1RysXUyaayblYR9g6ym4AdFoxEUprAa2OFKR0 Eum6pyDkWILdj5G1vgteX1fD2s7EuHz2tIUMGvmr0rpibBMN8psMmTzP/AIuybT/xQBG 6YiGprNtUBHGWXfPg5WYsPhkgz85jQzvl6bXKpcBX8xZn/6HtKP14k/3FwyX3aZSsnYj 3PIxcoDTzLv8oagq5/rDEuykn4WUfDj9q08BvvTrWjG8rvnPPRoXhTrp6VNjOLvQhAfi Qbxg+3P63d7qqf7+VfgMd5K5imT00OIJhoJPSiS341nkRfx156BpDeCpk+ZD9WnacwkN OJfA== X-Gm-Message-State: ANoB5pnlk6IzuyWlF/FLZ2TON2nkjggQiIEtgF1mDmdPJZdgPoMjKojc uAMK/HYooR6HQhuUxXOb87HaGnRCNWI= X-Google-Smtp-Source: AA0mqf4prhVofhL7l6ogcg5RxaZvLOtDg/cFtdYMiQ4UdAsJa8O2j55rZ3R/XnMU3xleKtlJO5/98g== X-Received: by 2002:a19:ca1b:0:b0:4a7:7d62:2807 with SMTP id a27-20020a19ca1b000000b004a77d622807mr8678603lfg.77.1669109673261; Tue, 22 Nov 2022 01:34:33 -0800 (PST) Received: from milin-wrk.rasu.local ([178.70.40.200]) by smtp.gmail.com with ESMTPSA id v14-20020ac2592e000000b00498f00420e9sm2410730lfi.194.2022.11.22.01.34.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:34:32 -0800 (PST) From: Mikhail Ilin To: u-boot@lists.denx.de Cc: Mikhail Ilin Subject: [PATCH] tools: imximage: Fix check array index Date: Tue, 22 Nov 2022 12:34:26 +0300 Message-Id: <20221122093426.12255-1-ilin.mikhail.ol@gmail.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.6 at phobos.denx.de X-Virus-Status: Clean The struct dcd_v1_t is initialized to MAX_HW_CFG_SIZE_V1 (60) structs 'dcd_type_addr_data_t', so the indexes to use on its elements are [0,59]. But on line 478, the variable 'length' can take on the value 60, which applies to array overflow: cd_v1->addr_data[length].type Thus, it is necessary to tighten the check on the 'size' variable on line 463. Fixes: 0b0c6af38738 ("Prepare v2020.01") Signed-off-by: Mikhail Ilin --- tools/imximage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/imximage.c b/tools/imximage.c index d7edd3c52f..8d45c917e6 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -460,7 +460,7 @@ static void print_hdr_v1(struct imx_header *imx_hdr) uint32_t size, length, ver; size = dcd_v1->preamble.length; - if (size > (MAX_HW_CFG_SIZE_V1 * sizeof(dcd_type_addr_data_t))) { + if (size >= (MAX_HW_CFG_SIZE_V1 * sizeof(dcd_type_addr_data_t))) { fprintf(stderr, "Error: Image corrupt DCD size %d exceed maximum %d\n", (uint32_t)(size / sizeof(dcd_type_addr_data_t)), -- 2.17.1