From patchwork Mon Jan 8 17:36:19 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: 123774 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3014621qgn; Mon, 8 Jan 2018 09:45:56 -0800 (PST) X-Google-Smtp-Source: ACJfBouyzBduOFH9ZlNIDVj7MgENDboPTLRWbSmwFhD3RCagazHzeYJ2u5PrqZhENxFztwIImpNv X-Received: by 10.80.171.72 with SMTP id t8mr17460157edc.244.1515433556269; Mon, 08 Jan 2018 09:45:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515433556; cv=none; d=google.com; s=arc-20160816; b=V1TkVVCYvKb1U4F0miTWhZuJgpFJMoNsrbEOUkLqeazoCbxMAYdj0KwwSd4xXBzhRs 9F+Lp0hzJqLh8sn3ZyDuNFGPqhJHS1k4tFaqNy4lLlpnz7ykVKnOKm5S6MRnu2TaeWw0 XWd9UYHDKG5fsX0jggf0qhTnb6aS6Xw/v+hCx2PaWDdCz05O7sz/SGyEQcE4UdBpTsL2 K4yNgHORqacusFBk+/5vs/HWEkpDfMQVhOlF1dt0XOT+fOPOSwBsLad6CVp9xvG10fE0 HllCrJdGyT8FRLjo+/uKVnuN1C1KrZgDIdy5lAI3B6vW0WYdAJ0wf6rWyz8yQxuNibFr WLvw== 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=jPXk9fxj3aD1d68PHTLQ1FO4wtXlIsUMlXuVRMuTxSbGExIKrSSpn3RCyXA+1k67zy 3f4mN7KiQIfyWvGjaXmrZqcAuE3MRXcL2cp1yntL/REaDHvlugMispK962S5fO89Ooiy 4r4ytPoTJ7SNh+wJMam+fLISShPx6mEcDBj6ifnuxdyVr24nqThtwm+wnAX6Zd29qrIJ sC5XIDQAMgGJXWiB3PwAk/K9PS6CbJ9k7nhx8ng0YUAgabCUb9CPcTFUUBfK/cmt/qw6 n6fnR+uf2TgvzGvKW8rRtdDntJAdsIaDWSxgFCbpHr9YKz4Hju3Zt70yrYTH8+PzdXq5 apCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CVEKSF1Z; 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 c47si3710247edb.86.2018.01.08.09.45.56; Mon, 08 Jan 2018 09:45: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=CVEKSF1Z; 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 D990FC21EC2; Mon, 8 Jan 2018 17:37:51 +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_DNSWL_BLOCKED, 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 E781AC21FC2; Mon, 8 Jan 2018 17:37:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 24967C21FB2; Mon, 8 Jan 2018 17:36:52 +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 A0BBDC21F88 for ; Mon, 8 Jan 2018 17:36:48 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id n138so15604877wmg.2 for ; Mon, 08 Jan 2018 09:36:48 -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=CVEKSF1ZdDCB35NQiw2Lx9OmtV2Q7mmN+6P9LlQWNhd22+b0CY4Z3KIr4bmqC4CXID 0iA+7ndUDxKDenFXpr7cicUULQD8LJ4WiMh2VA5MbzZjL5YhiDBzEC7qdfs5OBNU4YWO Mx/m2mK+kSmi75i7nJ76jGcEBU87LZZZRbnbM= 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=d+nv4OF9ZpLnZDsL4P7eMdko4biRw74LrJMEU3L/2mvflkMU67ec0gClH/63Fikhcm 95Ulz9muoVyhpLuZ7jzrwNr5ICM1bGphWla/pQUvFxp29ngnGbps2kbDGc7g9R8ey8ln xLljMyrvrtlOFE+RSN6byG8+gdPu1WoWiaP6GuOR9YTVL3ZwxqrtWdUP+hGuaJnzPkx7 r3QKfBAswqL1F0qTRhRM6TcF80pOnpoDRe+drBj2buOebe2ScOs9wokpqLrqu7sh17KJ 4KUYBznVTmIQ01DwSkc0jeTCA3/j/Y61cKFKdFiPGZHEXxW7APYTRWrw6rmgKi8sd4cN XXrA== X-Gm-Message-State: AKGB3mLzcd6sj4QOQoPvlp3c+u8d4p4+WUsx0bH6Gr9ZfJIJRRp8DVdI mFtnP2OstaYkxGDntQh+NU8bEaJ1V64= X-Received: by 10.80.161.167 with SMTP id 36mr17277285edk.38.1515433007973; Mon, 08 Jan 2018 09:36:47 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id a38sm7160033edf.3.2018.01.08.09.36.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Jan 2018 09:36:47 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, brenomatheus@gmail.com Date: Mon, 8 Jan 2018 17:36:19 +0000 Message-Id: <1515433001-13857-3-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515433001-13857-1-git-send-email-bryan.odonoghue@linaro.org> References: <1515433001-13857-1-git-send-email-bryan.odonoghue@linaro.org> Cc: Fabio Estevam Subject: [U-Boot] [PATCH v5 02/24] 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");