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>

diff --git a/include/tee/optee.h b/include/tee/optee.h
index e782cb0e0ed706217ef021a987fba442fc4848c3..4b9e94c1754430a412d7ca0aeb8140256c85f79c 100644 (file)
--- a/include/tee/optee.h
+++ b/include/tee/optee.h
@@ -55,4 +55,17 @@ static inline int optee_verify_image(struct optee_header *hdr,
 
 #endif
 
+#if defined(CONFIG_OPTEE)
+int optee_verify_bootm_image(unsigned long image_addr,
+                            unsigned long image_load_addr,
+                            unsigned long image_len);
+#else
+static inline int optee_verify_bootm_image(unsigned long image_addr,
+                                          unsigned long image_load_addr,
+                                          unsigned long image_len)
+{
+       return -EPERM;
+}
+#endif
+
 #endif /* _OPTEE_H */

diff --git a/lib/optee/optee.c b/lib/optee/optee.c
index 2cc16d7c97a2a0e6dc4053ebd0923b262804465a..365c078a51def7888cb2f0392b2a95b217d7f534 100644 (file)
--- 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;
+}