From patchwork Fri Jan 12 12:40:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 859861 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="A6I/VAMo"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zJ2WB5Zgnz9sBW for ; Fri, 12 Jan 2018 23:44:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4BAECC221B4; Fri, 12 Jan 2018 12:42:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C0D8BC221D8; Fri, 12 Jan 2018 12:40:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 27571C221BB; Fri, 12 Jan 2018 12:40:39 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id AA1BDC2219C for ; Fri, 12 Jan 2018 12:40:35 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id 141so11493981wme.3 for ; Fri, 12 Jan 2018 04:40:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w0UpYjfDIqm23d6EVyqoYJ+SiVwbAItHqPu71Xu0+2M=; b=A6I/VAMov1+zZre/F+9p+dGBrxDF9/xG2dj1UA4pFjofG3DHW2cQbkBcDDQpjtxQqY ABDe/KuWXNXY3dCLQshmC6yxYBWfLDF9SO4oRiSXCEcc+BEtsxgp03Z0ldP7BjLT5DmY B/v+9eqoKr0TaQYWgLKHBcLUYDFglRaS24k7M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w0UpYjfDIqm23d6EVyqoYJ+SiVwbAItHqPu71Xu0+2M=; b=ZvWXPSCPIXaEpQs6Eot96qEBfptozfRDwRLK/TLRb75T6htAAd1hr+IxWruCdFuGnQ 5rQa5AXCMkQ/scLh6xMCC4iYrTJTEXA3Be8JdF6W7Ps6VUkkCKYU3yGlgRmxXNZjJqdZ 466Zg/f+HCTOIEhu/X0/bpDauWA9qaG3hKQwuRqIaofQg14Je6HAluuc4BFGpxAGXgFO /yBcNnvwR+1f8RZ1s+gnf6Jy+l9NhL1OVVgaAxxQ79tyvkuveKz33M3vnBFYTjIrr87x Ct2GiOHcqyloXX/Oatpn1zuEYnVF5Vhh4ssySqXxarhcLwcTJp5aCk94DV+nzTE7YRQ5 xDHA== X-Gm-Message-State: AKGB3mKp2QG03TIs0UeEg/wvzRM3c0pLpUU5Zt4UR+rLjqmfmXdnS//4 juU9LPURlh/KzQBdD89oZ++zQ4jyB0U= X-Google-Smtp-Source: ACJfBosmpsU9mUF/Dn6upfYGlYeletwiTfpQLf30TApZznrBFv7xlF7sWsdQ3oHVtDLReWJs3k3/JQ== X-Received: by 10.80.205.15 with SMTP id z15mr36599976edi.83.1515760835136; Fri, 12 Jan 2018 04:40:35 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id w2sm13893585edb.4.2018.01.12.04.40.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Jan 2018 04:40:34 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Fri, 12 Jan 2018 12:40:04 +0000 Message-Id: <1515760819-15116-11-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515760819-15116-1-git-send-email-bryan.odonoghue@linaro.org> References: <1515760819-15116-1-git-send-email-bryan.odonoghue@linaro.org> Cc: Fabio Estevam Subject: [U-Boot] [PATCH v6 10/25] arm: imx: hab: Verify IVT self matches calculated address X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The IVT is a self-describing structure which contains a self field. The self field is the absolute physical base address the IVT ought to be at in memory. Use the IVT self field to validate the calculated ivt_addr bugging out if the two values differ. Signed-off-by: Bryan O'Donoghue Cc: Stefano Babic Cc: Fabio Estevam Cc: Peng Fan Cc: Albert Aribaud Cc: Sven Ebenfeld Cc: George McCollister Cc: Breno Matheus Lima Tested-by: Breno Lima Reviewed-by: Fabio Estevam --- arch/arm/mach-imx/hab.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 998d253..39f8f2d 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -450,6 +450,13 @@ int authenticate_image(uint32_t ddr_start, uint32_t image_size, if (verify_ivt_header(ivt_hdr)) goto hab_caam_clock_disable; + /* Verify IVT body */ + if (ivt->self != ivt_addr) { + printf("ivt->self 0x%08x pointer is 0x%08x\n", + ivt->self, ivt_addr); + goto hab_caam_clock_disable; + } + start = ddr_start; bytes = image_size; #ifdef DEBUG