From patchwork Sat Dec 30 01:08:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 854036 X-Patchwork-Delegate: sbabic@denx.de 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="FkTrcrhg"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3z7ltR3Byyz9sQm for ; Sat, 30 Dec 2017 12:17:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D72E8C21DAB; Sat, 30 Dec 2017 01:12:58 +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 5C74DC21E2C; Sat, 30 Dec 2017 01:10:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BA095C21DCE; Sat, 30 Dec 2017 01:09:21 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id 04899C21DA6 for ; Sat, 30 Dec 2017 01:09:17 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id t8so50410998wmc.3 for ; Fri, 29 Dec 2017 17:09:17 -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=G8z/3TFmKGvjjpDslWr0bG7tKU0tOafBwtE3humwEZA=; b=FkTrcrhgc2CWLhvyOYb8FudOc3SSK8a48baM2hUlUJi/9nddNrPbgwQqW2APEhN7rQ PH5auSrAQdBvEs/bnQYAYRbDX8m9El2YjtcEkTbUYulM8giggpJhf49bOLAanaM8HmdU E9sAJ0g5w0Qkr3hAxAMuEohwJjK5oBP/sGsVU= 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=G8z/3TFmKGvjjpDslWr0bG7tKU0tOafBwtE3humwEZA=; b=rq0ljaWJCyV553h1xtWOR5V2A4fEv+bH+4W20+XM0XD7OnTdqLmMfXrKLjOUwVfLH0 kXppWEUQh1kgYTewvr6Jp5yhQth0WdBOjzaqJDxXkPQEzkA7OumO83ap6YC6Iy5r4U9n HRT4AM+2AJnp+47gDusDzoE5a6VU1APt2ZcByElhyBsWqovCxtPkUqSqcXb1VcEBHHGg 2eHNHDpIKa9K95WLMgXhfc7ot2BA55NORyexlWI2Aq6QiqSou3BhYcTSM+Cf55snAARJ nLzIz3HZnXcY/sTkmLSaOubejQVmcy6aoZLvemELUFIZoTgm5Tm1oQW2QJd3mDMHjAIS oxIg== X-Gm-Message-State: AKGB3mJqelFZps2HdWdn9hokzhj5dknXER+rkull5Vw+JYw8DaR0yfdn wILmKwHdR8feJAe3cboXcnX+meywcII= X-Google-Smtp-Source: ACJfBouqYLqeEuNE1xVQAo+TGvIUgp9ttYTpfog+wBdMzyaXEzuICSE98eG0v+Mp6o+bl3HBzYHkEQ== X-Received: by 10.80.186.18 with SMTP id g18mr47608572edc.206.1514596156447; Fri, 29 Dec 2017 17:09:16 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id f9sm26484148edm.83.2017.12.29.17.09.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Dec 2017 17:09:15 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Sat, 30 Dec 2017 01:08:40 +0000 Message-Id: <1514596142-22050-12-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514596142-22050-1-git-send-email-bryan.odonoghue@linaro.org> References: <1514596142-22050-1-git-send-email-bryan.odonoghue@linaro.org> Cc: Fabio Estevam Subject: [U-Boot] [PATCH v3 11/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 --- 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 cb6214d..479ed96 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