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: 122786 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2131917qgn; Wed, 27 Dec 2017 04:43:39 -0800 (PST) X-Google-Smtp-Source: ACJfBotWWJ7UKDlFckRdIVR35zSngjHSdxjmo8Oe4p7C8EXZmB7tvUzCWWat5Oh62R4oxw31gA4r X-Received: by 10.80.193.129 with SMTP id m1mr36179188edf.207.1514378619857; Wed, 27 Dec 2017 04:43:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514378619; cv=none; d=google.com; s=arc-20160816; b=JRUvyuUY8QxJHcKwMiHqIzRSxqlQMS5xrOSiKDw1bambrmpK2DLh4kqnBmzdeOJMCX A3tD9pyN57CLhDds3hu9Y3uOAfMouEDY75UeTEZ3j5qqEtdj/AR9RmicJ9bCC5wbsof5 XY1h1f5lYB1gHnyQdAX4eIwCdrHAn5VKfY0l8KR4SlQSy4hwP2fgXWp6FxywRvxqTNtC bd9WHW9Le6hHMvOLPdqmfMOR0MZ8zSlQDeOJV2m2t/CVHPxLg52tlSEeJI2vSMn17wnR Y7VEVoUq0i3qvlYgvpJP6vhV7/FV8Uxj9PLHXl1pXsTjrvvF7eLJ004KOwurmMHCdZoi 9Bkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:arc-authentication-results; bh=Xr93XpVWwoEAwOFTyjLEyZLVkBd9UYfeqHepu517Sdw=; b=NPGqr0v6T/r7t92qLS1SOnSLkAPd7jognE6typ4HAYD/+Z4PpN5DrcJ6yXq3VWBjFL nBtni7p6KWN94e5ZJVOhcrT8OpvcfnhfLQOTKlXrGnSA0NAcqJJRQi4m/8T4PHbnLI2M z0tXPMlnpg03XJCet9Oz+MvAD0U9BQ3yNxE6iOyvVkVESAW30/MCYN8JXb6mIMUmy2/F Hns5HSItqG1OkowOpMAdZ/qYuyHJt1AoFm/qSHd1yxO0ADFdSncqDqlmowaHQa572PHZ qU60P1TmNe5THZqbFHOwy3cRSjYkFwE3XYYFlXERmqIrHrH2CdkjTys58dH4Jwx7QE7D UPJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=A8K8NOK/; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id a54si2942037edc.11.2017.12.27.04.43.39; Wed, 27 Dec 2017 04:43:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=A8K8NOK/; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id 6E932C21E0F; Wed, 27 Dec 2017 12:36:23 +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-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