From patchwork Wed Dec 27 12:25:45 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: 122780 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp2124561qgn; Wed, 27 Dec 2017 04:36:12 -0800 (PST) X-Google-Smtp-Source: ACJfBov1SQvUEBZ3Z1nrr2f3lpNV/S1rFLy9tVP9SJnXQzyUEfSc1aP1rxwHotC/m7djsgXophqd X-Received: by 10.80.180.16 with SMTP id b16mr35384922edh.136.1514378171912; Wed, 27 Dec 2017 04:36:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514378171; cv=none; d=google.com; s=arc-20160816; b=vPfKitfdV074T+HYz75a3IqQDomFvaAPKU6ciTzQOs/0knAZQRLqZY9lzFVzUUUc5W yz9HaP1+w3Ftp/8/j7N5GzTMtzmIkLk7n7zviype9JTHHsO9uVUrRD7Zg8QXTeLQ4tIL Qq980RV4i0cfdjgUmTC2Ehehi8QA0HpG7dbatlwnmETsNgWsjeIhY4a6I2lx1ooC2aTl cTBvBiT0223W39jN3qWbYaK1yGBPuL5KBniqtNGfPAfUsPZz2T7B/vf+8jRwXC7Q8ma9 +VyBw8+w4GBJYkZiq1+9QxYA/EYus9dDOwrLniPL/z+oJ/SOzd9l9pL4mO3AKbNqN3Yu hxfA== 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=axA0aYbUteFZtbmJCwkpvlnzZThxk/aTWmAcWwvHNo4=; b=j6xlaIsvR2YZk7/3+ITsgvEMeq2xGoNI1d6UwPEevNp6LXl3mZK1VbQ3JU0ol7dnBH l7Yl07I3i3tea5bM5/evn1EJiLTzAr1QiZjg23qoBjYrfJjnVGW0otFEgxfahxYLEw2w h/W6fLEozfuc5IHNcROlTnm4qzvXBi7JNIPCrN8U2AUISckjep8azh+FvYhqqUzFUsgr RdYuUYNBSf8KAl9aQqOEDDaESnn1Hv5QPij6Ftl9t2QaDcDboBnsManEKjjpaI+Vrd3V WImgzQLZ8HC/oSW19kNP8r8VnTm1dY7yqMxMR0MOSh/K1DnungERNXYNi+u4uzuzTRoP 66pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Gt4igoA3; 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 x27si3741449edb.73.2017.12.27.04.36.11; Wed, 27 Dec 2017 04:36:11 -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=Gt4igoA3; 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 0333EC21DEF; Wed, 27 Dec 2017 12:33:43 +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 3C024C21E24; Wed, 27 Dec 2017 12:33:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8956DC21C4A; Wed, 27 Dec 2017 12:26:21 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id 278F1C21C34 for ; Wed, 27 Dec 2017 12:26:21 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id g75so39385112wme.0 for ; Wed, 27 Dec 2017 04:26:21 -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=UCjKhrpKabbf9X5VVSpxoPHt/gZpK4VmFK8Al+DeIWo=; b=Gt4igoA3LWg0nwCYUfDn9ISHGV7iZ3axoyP7WxDUyYzdUpDLCLYFeaMWtWx953QQq9 szq/Jrc0ILyhmZlKT/AWLFA1SzzdpqW5f0tLALaBKxC/jjO5V8ODtMvCGzIajPwhDFRL Ri0TUgsvp1U9a1vsiZ/qts+zmNgWv4yQgBv+A= 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=UCjKhrpKabbf9X5VVSpxoPHt/gZpK4VmFK8Al+DeIWo=; b=F8UTif13DhJctiaYr5SMCW0nlZLmKYAQyCoNXtbh9uuHm5yr5eedMRr5CMsww8VrWT tBz3lPOJk8lJsK/6E5GHvqLeI5btboeOmpAAWNFRab9Y7yd+gUgXQhW4qsepxTPwudKh AQBYQT6oBoTfEv3cQMykg1fWUTNeDMnzfC4dm8vJ0g/DUb+JiwZfhnnZqyJo2SXfKWWk SszucMMlWOPJ4z3t9Xm+3O15O0J4pPwSbN0nKvMTrWNQoZHrmGCG/ySIeaGs0W3l6UOO 1HyGfc1Ufb3e4LSau8dPpMPnR52D5CUBE/CuWNKD90gBTfVQFjnqGenA+LXUn6JVQk42 v5gA== X-Gm-Message-State: AKGB3mLARk5x1wjiaU2c5saVZuhwK5eLnOneyNnTHf5oHws2bhSNVLSA y5GOwNYnsXbRn5YMlrKCnpkHBBBPkqw= X-Received: by 10.80.164.27 with SMTP id u27mr33996163edb.11.1514377580566; Wed, 27 Dec 2017 04:26:20 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id a5sm28388838edm.47.2017.12.27.04.26.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Dec 2017 04:26:19 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de Date: Wed, 27 Dec 2017 12:25:45 +0000 Message-Id: <1514377566-28512-3-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 02/23] arm: imx: hab: Fix authenticate_image result code 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" authenticate_image returns 1 for success and 0 for failure. That result code is mapped directly to the result code for the command line function hab_auth_img - which means when hab_auth_img succeeds it is returning CMD_RET_FAILURE (1) instead of CMD_RET_SUCCESS (0). This patch fixes this behaviour by making authenticate_image() return 0 for success and 1 for failure. Both users of authenticate_image() as a result have some minimal churn. The upshot is once done when hab_auth_img is called from the command line we set $? in the standard way for scripting functions to act on. Fixes: 36c1ca4d46ef ("imx: Support i.MX6 High Assurance Boot authentication") 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 | 9 ++++++--- arch/arm/mach-imx/spl.c | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 09892a6..9fe6d43 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -373,7 +373,10 @@ static int do_authenticate_image(cmd_tbl_t *cmdtp, int flag, int argc, ivt_offset = simple_strtoul(argv[2], NULL, 16); rcode = authenticate_image(addr, ivt_offset); - + if (rcode == 0) + rcode = CMD_RET_SUCCESS; + else + rcode = CMD_RET_FAILURE; return rcode; } @@ -415,7 +418,7 @@ int authenticate_image(uint32_t ddr_start, uint32_t image_size) uint32_t load_addr = 0; size_t bytes; ptrdiff_t ivt_offset = 0; - int result = 0; + int result = 1; ulong start; hab_rvt_authenticate_image_t *hab_rvt_authenticate_image; hab_rvt_entry_t *hab_rvt_entry; @@ -510,7 +513,7 @@ int authenticate_image(uint32_t ddr_start, uint32_t image_size) } if ((!is_hab_enabled()) || (load_addr != 0)) - result = 1; + result = 0; return result; } diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index d0d1b73..6e930b3 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -163,8 +163,8 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) /* HAB looks for the CSF at the end of the authenticated data therefore, * we need to subtract the size of the CSF from the actual filesize */ - if (authenticate_image(spl_image->load_addr, - spl_image->size - CONFIG_CSF_SIZE)) { + if (!authenticate_image(spl_image->load_addr, + spl_image->size - CONFIG_CSF_SIZE)) { image_entry(); } else { puts("spl: ERROR: image authentication unsuccessful\n");