From: Marco Felsch <m.felsch@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 09/18] optee: add header version check
Date: Thu, 11 Jan 2024 12:48:32 +0100 [thread overview]
Message-ID: <20240111114841.2676939-10-m.felsch@pengutronix.de> (raw)
In-Reply-To: <20240111114841.2676939-1-m.felsch@pengutronix.de>
OPTEE supports two header versions right now we do only support V1.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
common/optee.c | 5 +++++
include/tee/optee.h | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/common/optee.c b/common/optee.c
index fd2b03d06d2d..6a8084839619 100644
--- a/common/optee.c
+++ b/common/optee.c
@@ -14,6 +14,11 @@ int optee_verify_header(struct optee_header *hdr)
return -EINVAL;
}
+ if (hdr->version != OPTEE_VERSION_V1) {
+ pr_err("Only V1 headers are supported right now\n");
+ return -EINVAL;
+ }
+
if (IS_ENABLED(CPU_V7) &&
(hdr->arch != OPTEE_ARCH_ARM32 || hdr->init_load_addr_hi)) {
pr_err("Wrong OP-TEE Arch for ARM v7 CPU\n");
diff --git a/include/tee/optee.h b/include/tee/optee.h
index 607f5072d385..b5ba0a71d7c9 100644
--- a/include/tee/optee.h
+++ b/include/tee/optee.h
@@ -14,7 +14,8 @@
#include <linux/errno.h>
#define OPTEE_MAGIC 0x4554504f
-#define OPTEE_VERSION 1
+#define OPTEE_VERSION_V1 1
+#define OPTEE_VERSION_V2 2
#define OPTEE_ARCH_ARM32 0
#define OPTEE_ARCH_ARM64 1
--
2.39.2
next prev parent reply other threads:[~2024-01-11 11:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 11:48 [PATCH 00/18] Dynamic OP-TEE Loading Marco Felsch
2024-01-11 11:48 ` [PATCH 01/18] ARM: i.MX8M: atf: make use of imx8m*_save_bootrom_log macros Marco Felsch
2024-01-11 12:06 ` Ahmad Fatoum
2024-01-11 12:16 ` Marco Felsch
2024-01-11 15:28 ` Ahmad Fatoum
2024-01-11 11:48 ` [PATCH 02/18] ARM: i.MX8M: bundle imx-scratch code Marco Felsch
2024-01-11 11:48 ` [PATCH 03/18] ARM: i.MX8M: scratch: make imx_scratch_space private Marco Felsch
2024-01-11 11:48 ` [PATCH 04/18] ARM: i.MX8M: romapi: refactor saving the bootrom log Marco Felsch
2024-01-11 11:48 ` [PATCH 05/18] ARM: i.MX8M: scratch: add optee_hdr area Marco Felsch
2024-01-11 11:48 ` [PATCH 06/18] common: limit BOOTM_OPTEE to 32bit systems Marco Felsch
2024-01-11 11:48 ` [PATCH 07/18] common: add OPTEE_SHM_SIZE to configure optee shared memory Marco Felsch
2024-01-11 13:24 ` Marco Felsch
2024-01-11 11:48 ` [PATCH 08/18] optee: add support to verify 64-bit headers as well Marco Felsch
2024-01-11 11:48 ` Marco Felsch [this message]
2024-01-11 11:48 ` [PATCH 10/18] optee: add helper functions to set/get the optee memory base Marco Felsch
2024-01-11 11:48 ` [PATCH 11/18] optee: optee_verify_header: constify optee_header Marco Felsch
2024-01-11 11:48 ` [PATCH 12/18] ARM64: mmu: add dynamic optee memory mapping support Marco Felsch
2024-01-11 12:07 ` Ahmad Fatoum
2024-01-11 12:14 ` Marco Felsch
2024-01-11 15:25 ` Ahmad Fatoum
2024-01-11 11:48 ` [PATCH 13/18] ARM: i.MX8M: add dynamic optee memory of-fixup support Marco Felsch
2024-01-11 11:48 ` [PATCH 14/18] drivers: tee: optee: add support for dynamic optee memory base address Marco Felsch
2024-01-11 11:48 ` [PATCH 15/18] ARM: i.MX8M: atf: add support for optee hdr parsing Marco Felsch
2024-01-11 11:48 ` [PATCH 16/18] ARM: i.MX8M: allow board code to configure the bl33 loadaddr Marco Felsch
2024-01-11 11:48 ` [PATCH 17/18] ARM: i.MX8M: cleanup MX8M*_ATF_BL33_BASE_ADDR defines Marco Felsch
2024-01-11 11:48 ` [PATCH 18/18] ARM: i.MX8M: fix optee of-fixup logic Marco Felsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240111114841.2676939-10-m.felsch@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox