From patchwork Tue Jan 2 16:43:48 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: 123160 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9170933qgn; Tue, 2 Jan 2018 08:46:56 -0800 (PST) X-Google-Smtp-Source: ACJfBounInhz8S1z4TqNDLGYZ4pKcMAuGUrvHl6RkxHxx1FVUtBP3pX7xTJRNbs5jY3S1Gb70Tf+ X-Received: by 10.80.214.74 with SMTP id c10mr61603990edj.271.1514911616841; Tue, 02 Jan 2018 08:46:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514911616; cv=none; d=google.com; s=arc-20160816; b=yxOrvG3XY5xumm8mhqaqPDtH4cf+yAz8uA+Qfdbie6fbE4YAfgFsDeCqYIUjlwFI6J JqqUWk+eSsyEqG7rfOF4bYWojbGEtzzfgFUYWBUtCPTtiBoWHN6pdrfz/FMJ8tOpIzwt zyPknNxvz7joRbI9sWshjdFVqMkUNmFITg32Zxyzt1uhuIlpFfwLP9GgkL1KZwo2/9iK h5504EcUKW2PbFA5sriEyjoaM6bKkQBtGrwNoKtFs5hiGEf1Bqgvcn79w8/XSfInAPla 0YnKIgRJHd6R/ev9Ol4f7dVNep0BRB79rOr+iNF9KwOtiwiZGPJuBdxCNFq1FVl3P0xj xO9Q== 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=rHJ9/QY5qb5XA3eZSsVELR4G9CQd39u1ezozHIDIsGQ=; b=nOoFvocq0u5UAVTqAEAZMlw3pncPaKA+lpLfo4AkSYU5JmETG0YRsVBlp0+v//PLKS 3UjIj34h9z9gSSiIMkMq10TXZ9BBZkKoO+3gOllqAQ1VYO3POfT6VbeHLGBBethm5OJG Rpr7leS1dgJ6zn2rTqa0yxrQ2+MyFZAe1joczJEEplkKaTXUXvH0qzWgfFTZ2W3XDddN UUYwehT/92U5apLI2myLasRekanU5FOUR4j7SFFgKSm5F0sRqUUlZnufKxtSwpBtowQS 5JFpGpf+6WE4uKoJZyIknasNAJk+kw8og/g/qg1F2OKvLfn1tELk4zMgcmhH+2HiqTRC AwXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=d9xZMiFe; 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 r1si11990479edr.56.2018.01.02.08.46.56; Tue, 02 Jan 2018 08:46:56 -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=d9xZMiFe; 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 602E3C21E4C; Tue, 2 Jan 2018 16:45:07 +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 0E56AC21DCE; Tue, 2 Jan 2018 16:44:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B42EBC21DB0; Tue, 2 Jan 2018 16:44:29 +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 08C22C21C29 for ; Tue, 2 Jan 2018 16:44:26 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id t8so62060330wmc.3 for ; Tue, 02 Jan 2018 08:44:26 -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=TwZ+1qIB7/yAjZU3U+qR5EWeNMJDqcVtGrJ+SK9DAU4=; b=d9xZMiFeekmuDii0+t2aSagJnfqcrZKyeGpcf2gBJWpuqTmXnCEj6g/AyBwv2rIyRh UwrQ6fmSshBiTGvolS9iRlQpYIXkSQUsK5Uah2KEjyrV91+ry+slOU/nu0eT68DUfeBk LFgKwIFkIhO68DVU9bgBMjJcXgpo5g1DEUx6M= 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=TwZ+1qIB7/yAjZU3U+qR5EWeNMJDqcVtGrJ+SK9DAU4=; b=jqZNv9ilNbsw5AS1+hD2+jXt9X4J8CfFCu87I2vvMwF0IlFJ1wNA3BoIofCowusQCI 1BoTXt9/gplgoY1GwZGoqQPv0Nmb+fGxCdyRiJP8b+iERcqK+jXYReVSXmD5mikHdQnS Sb0dIEqzsE1wgJN1+c3Kn9Xif/pLYXnHS/SWklnXXy3cp0pXUkeZkWKLunyfPkpfxiH/ pXd6yklYLVyWkp3Xb2jBriyna1IDGvf5IvsCHo6AyB5RjXjYGIhCycuiaDb+zH+5ZHbM /O9sMQwm87iy8IikvlsixNlr7xDbOZSU1J4YdVrUmoLJH/fFu3yU9dqcvT1TjlAnvOrF duBA== X-Gm-Message-State: AKGB3mIF8Rr4eMfA+/oehuRHlS4odlzMGzMgIsLDTxFJ+MyG5QV2pKqO 42wAHuV/YkBFTgtXvjQ4M8vfd/lryF4= X-Received: by 10.80.139.180 with SMTP id m49mr65035691edm.36.1514911465424; Tue, 02 Jan 2018 08:44:25 -0800 (PST) Received: from localhost.localdomain (D4CCACC7.cm-2.dynamic.ziggo.nl. [212.204.172.199]) by smtp.gmail.com with ESMTPSA id z5sm29850584edh.76.2018.01.02.08.44.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Jan 2018 08:44:24 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Tue, 2 Jan 2018 16:43:48 +0000 Message-Id: <1514911451-4520-3-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514911451-4520-1-git-send-email-bryan.odonoghue@linaro.org> References: <1514911451-4520-1-git-send-email-bryan.odonoghue@linaro.org> Cc: Fabio Estevam Subject: [U-Boot] [PATCH v4 02/25] 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 Cc: Breno Matheus Lima --- 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");