From patchwork Wed Dec 27 12:25:53 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: 853161 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="A8K8NOK/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3z6CL33BLxz9s7h for ; Wed, 27 Dec 2017 23:47:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 18D49C21E48; Wed, 27 Dec 2017 12:36:24 +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 F114DC21EA7; Wed, 27 Dec 2017 12:33:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0D82BC21C4A; Wed, 27 Dec 2017 12:26:31 +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 85FDCC21C34 for ; Wed, 27 Dec 2017 12:26:31 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id g130so39342649wme.0 for ; Wed, 27 Dec 2017 04:26:31 -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=CglbKAS3LVkyfgvwv8itTfbHEUiJ/hsNTQ+qfKNXD+w=; b=A8K8NOK/PTsZyfCKDYcpfXX63uqDTs1yNrRzX+cGLhDotrK2cl16yMgBV7c7y9QGv0 U43dlT/KYnrbAiZOHpZxIga9jIRqI4BqnlIGvJekkK4kND0P0kjxOB1+A7V/neLrFQ3U jHWep8GNyTwY6gg4NtMtrXMY7e15Giq7jR2zw= 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=CglbKAS3LVkyfgvwv8itTfbHEUiJ/hsNTQ+qfKNXD+w=; b=orNaRr5gmFJkZyCFu9WWX0ma7//Emp8L3Fbp2xvy+2ytkDCfB9eJ2YPSZeRJfYDx/z c/+3E6kbeNzxSQlHFBTIrl6lquRlihvep1YeRNssI323UzSEgaxP5sh20o7cZ4aAtVRw pMEFrYALgASB5ukTENe64H6TcYjxZVgTIMY4r3Bky/N25w+O3t23wEPIhMss94DeOGCC fzrcaEX7VUGFhvnkc5E0op3R4+9r8ngpcACpG2E2sUmNV+CFf8cfzth4hHP9gQETwLy2 Gv8RD9IDXNxnUjHKZN/GEmdx9kHFo+ybD5R/wMa8WM8fZ1l1bSvKghjwqI8nwgw1Tyw6 t1sQ== X-Gm-Message-State: AKGB3mID8n6E/nwkJFXfN3BHd5mlLnNfEh8TiqvKQaLUkF0KllvrzJUA sP4wT6JMdhwJezKLJHugywI4etRUOQc= X-Google-Smtp-Source: ACJfBot195R07q00g0NxPiqrOB+UCEaS4WI3jrtYEau4tZmyvHOiQsKhcMdFNr/yOpiRjTcUw27Ftw== X-Received: by 10.80.134.197 with SMTP id 5mr35689281edu.129.1514377590975; Wed, 27 Dec 2017 04:26:30 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id a5sm28388838edm.47.2017.12.27.04.26.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Dec 2017 04:26:30 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Wed, 27 Dec 2017 12:25:53 +0000 Message-Id: <1514377566-28512-11-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514377566-28512-1-git-send-email-bryan.odonoghue@linaro.org> References: <1514377566-28512-1-git-send-email-bryan.odonoghue@linaro.org> X-Mailman-Approved-At: Wed, 27 Dec 2017 12:32:58 +0000 Cc: Fabio Estevam Subject: [U-Boot] [PATCH 10/23] arm: imx: hab: Add IVT header verification 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 header contains a magic number, fixed length and one of two version identifiers. Validate these settings before doing anything with a putative IVT binary. Signed-off-by: Bryan O'Donoghue Cc: Stefano Babic Cc: Fabio Estevam Cc: Peng Fan Cc: Albert Aribaud Cc: Sven Ebenfeld Cc: George McCollister --- arch/arm/mach-imx/hab.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 76267a7..5591cb5 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -229,6 +229,31 @@ uint8_t hab_engines[16] = { -1 }; +static int ivt_header_error(const char *err_str, struct ivt_header *ivt_hdr) +{ + printf("%s magic=0x%x length=0x%02x version=0x%x\n", err_str, + ivt_hdr->magic, ivt_hdr->length, ivt_hdr->version); + + return 1; +} + +static int verify_ivt_header(struct ivt_header *ivt_hdr) +{ + int result = 0; + + if (ivt_hdr->magic != IVT_HEADER_MAGIC) + result = ivt_header_error("bad magic", ivt_hdr); + + if (be16_to_cpu(ivt_hdr->length) != IVT_TOTAL_LENGTH) + result = ivt_header_error("bad length", ivt_hdr); + + if (ivt_hdr->version != IVT_HEADER_V1 && + ivt_hdr->version != IVT_HEADER_V2) + result = ivt_header_error("bad version", ivt_hdr); + + return result; +} + static inline uint8_t get_idx(uint8_t *list, uint8_t tgt) { uint8_t idx = 0; @@ -394,6 +419,8 @@ int authenticate_image(uint32_t ddr_start, uint32_t image_size, hab_rvt_authenticate_image_t *hab_rvt_authenticate_image; hab_rvt_entry_t *hab_rvt_entry; hab_rvt_exit_t *hab_rvt_exit; + struct ivt *ivt; + struct ivt_header *ivt_hdr; hab_rvt_authenticate_image = hab_rvt_authenticate_image_p; hab_rvt_entry = hab_rvt_entry_p; @@ -416,6 +443,13 @@ int authenticate_image(uint32_t ddr_start, uint32_t image_size, /* Calculate IVT address header */ ivt_addr = ddr_start + ivt_offset; + ivt = (struct ivt *)ivt_addr; + ivt_hdr = &ivt->hdr; + + /* Verify IVT header bugging out on error */ + if (verify_ivt_header(ivt_hdr)) + goto hab_caam_clock_disable; + start = ddr_start; bytes = image_size; #ifdef DEBUG