From patchwork Tue Jan 23 20:41:59 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: 865035 X-Patchwork-Delegate: trini@ti.com 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="LxL2XJAp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zR0nM1fNdz9s82 for ; Wed, 24 Jan 2018 07:50:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D7D9BC21F0A; Tue, 23 Jan 2018 20:48:53 +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 B0A12C2214E; Tue, 23 Jan 2018 20:42:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3D1D0C2217F; Tue, 23 Jan 2018 20:42:34 +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 A8315C220EC for ; Tue, 23 Jan 2018 20:42:11 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id 143so4326144wma.5 for ; Tue, 23 Jan 2018 12:42:11 -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=9l4y29YT9GA9C87v2s0KMfjVt7b/wQv5HyUsRKb+Koc=; b=LxL2XJApdITdh9c7JEk4mFzi9ajBpB0Y7QuByqIGiqFf53mL9ZAaSnEcQdHiUk2TOr mfJuj8WEGw1fdzNFsgOvXPWntVsy45Cs8I7ocUZSPWLbHUVxMdMdjm4XEPAuJAhriesT MdKvC6O8zJmUc5/IXIkghJVR9gb4o9UtQEJTk= 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=9l4y29YT9GA9C87v2s0KMfjVt7b/wQv5HyUsRKb+Koc=; b=YhKaFrNk0zoKi795c2HT3IKFwqlDBgDvCI3CEtDIRuxvBm9D6vD68ZTbPgZxSqlFok Vcq+bfoahWSSpKXjxMSI/VkXFWgdSTqhYg0Bqol6kSuxZfZeIAxGi3BQvg4pGk+QZvt7 f+YYz/HhN8vSQ3XnYEEkvHEc4X1ctJ9otsb2gfS1PAGlNTnlk+Dlt+TxMKCXxq+7t+eJ M8jyFp2FPc+zhpdjclm6W2QpnxkO9UBI1PfmvS9tz9HDn0X/O9WNKCypp7BsIQ3Ua/pr BSCAx5TodwSebewtCLYokBzHSmMmgrfb3ptMW8vD0ij0rfRzZCAXSOhJ3jRy+hrwaR6T c0MQ== X-Gm-Message-State: AKwxytf+V3uUC+CEKaIFGPkw5kfw7kSqoGOuZZGfSSGRERyiPRHF0pHt Lmn0xT5+iNGgzmFW8m91NFxo5QfqQ5c= X-Google-Smtp-Source: AH8x226Pt/cFvaIjCqx0AED7aRfB6akpDmZWk5O8pr6VzEapH23t+BUe7D+hvVZm5pV9ItYsKy3W/Q== X-Received: by 10.80.153.150 with SMTP id m22mr21299249edb.303.1516740131177; Tue, 23 Jan 2018 12:42:11 -0800 (PST) Received: from localhost.localdomain ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id k12sm12400896edl.86.2018.01.23.12.42.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jan 2018 12:42:10 -0800 (PST) From: Bryan O'Donoghue To: u-boot@lists.denx.de, trini@konsulko.com Date: Tue, 23 Jan 2018 20:41:59 +0000 Message-Id: <1516740120-948-9-git-send-email-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516740120-948-1-git-send-email-bryan.odonoghue@linaro.org> References: <1516740120-948-1-git-send-email-bryan.odonoghue@linaro.org> Cc: harinarayan@ti.com Subject: [U-Boot] [PATCH v3 8/9] optee: Add error printout 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" When encountering an error in OPTEE verification print out various details of the OPTEE header to aid in further debugging of encountered errors. Signed-off-by: Bryan O'Donoghue Cc: Harinarayan Bhatta Cc: Andrew F. Davis Cc: Tom Rini Cc: Kever Yang Cc: Philipp Tomsich Cc: Peng Fan Tested-by: Peng Fan --- lib/optee/optee.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/optee/optee.c b/lib/optee/optee.c index 365c078..78a15e8 100644 --- a/lib/optee/optee.c +++ b/lib/optee/optee.c @@ -8,6 +8,12 @@ #include #include +#define optee_hdr_err_msg \ + "OPTEE verification error:" \ + "\n\thdr=%p image=0x%08lx magic=0x%08x tzdram 0x%08lx-0x%08lx " \ + "\n\theader lo=0x%08x hi=0x%08x size=0x%08lx arch=0x%08x" \ + "\n\tuimage params 0x%08lx-0x%08lx\n" + int optee_verify_image(struct optee_header *hdr, unsigned long tzdram_start, unsigned long tzdram_len, unsigned long image_len) { @@ -42,10 +48,19 @@ int optee_verify_bootm_image(unsigned long image_addr, ret = optee_verify_image(hdr, tzdram_start, tzdram_len, image_len); if (ret) - return ret; + goto error; - if (image_load_addr + sizeof(*hdr) != hdr->init_load_addr_lo) + if (image_load_addr + sizeof(*hdr) != hdr->init_load_addr_lo) { ret = -EINVAL; + goto error; + } + + return ret; +error: + printf(optee_hdr_err_msg, hdr, image_addr, hdr->magic, tzdram_start, + tzdram_start + tzdram_len, hdr->init_load_addr_lo, + hdr->init_load_addr_hi, image_len, hdr->arch, image_load_addr, + image_load_addr + image_len); return ret; }