summaryrefslogtreecommitdiff
path: root/lib/optee
diff options
context:
space:
mode:
authorBryan O'Donoghue <bryan.odonoghue@linaro.org>2018-03-13 19:50:33 +0300
committerTom Rini <trini@konsulko.com>2018-03-19 23:14:24 +0300
commitc5a6e8bd00cc7257541a904682206bdc0be2bab4 (patch)
treeed622975ed7ebcdb105f2e65ac2535756f531f9f /lib/optee
parentdd5a12e28799366d3c64434f6b347550a4600231 (diff)
downloadu-boot-c5a6e8bd00cc7257541a904682206bdc0be2bab4.tar.xz
optee: Add optee_verify_bootm_image()
This patch adds optee_verify_bootm_image() which will be subsequently used to verify the parameters encoded in the OPTEE header match the memory allocated to the OPTEE region, OPTEE header magic and version prior to handing off control to the OPTEE image. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Cc: Harinarayan Bhatta <harinarayan@ti.com> Cc: Andrew F. Davis <afd@ti.com> Cc: Tom Rini <trini@konsulko.com> Cc: Kever Yang <kever.yang@rock-chips.com> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Cc: Peng Fan <peng.fan@nxp.com>
Diffstat (limited to 'lib/optee')
-rw-r--r--lib/optee/optee.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index 2cc16d7c97..365c078a51 100644
--- a/lib/optee/optee.c
+++ b/lib/optee/optee.c
@@ -29,3 +29,23 @@ int optee_verify_image(struct optee_header *hdr, unsigned long tzdram_start,
return 0;
}
+
+int optee_verify_bootm_image(unsigned long image_addr,
+ unsigned long image_load_addr,
+ unsigned long image_len)
+{
+ struct optee_header *hdr = (struct optee_header *)image_addr;
+ unsigned long tzdram_start = CONFIG_OPTEE_TZDRAM_BASE;
+ unsigned long tzdram_len = CONFIG_OPTEE_TZDRAM_SIZE;
+
+ int ret;
+
+ ret = optee_verify_image(hdr, tzdram_start, tzdram_len, image_len);
+ if (ret)
+ return ret;
+
+ if (image_load_addr + sizeof(*hdr) != hdr->init_load_addr_lo)
+ ret = -EINVAL;
+
+ return ret;
+}