aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2021-10-19 22:22:55 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-10-19 22:22:55 +0200
commit33d99fdb48b4117a52a5371fa453fe462575b7c1 (patch)
tree301a6b7487d1a54a10754b9512d83970aaa4f829
parentcc808acb9d1055d4298b0150244bfac418904175 (diff)
parent21d2be83a2eabb328071e857e538ced3c8351874 (diff)
downloadtrusted-firmware-a-33d99fdb48b4117a52a5371fa453fe462575b7c1.tar.gz
Merge "fix(lib/optee): correct signedness comparison" into integration
-rw-r--r--lib/optee/optee_utils.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/optee/optee_utils.c b/lib/optee/optee_utils.c
index d090b38260..72979cd9de 100644
--- a/lib/optee/optee_utils.c
+++ b/lib/optee/optee_utils.c
@@ -82,11 +82,14 @@ static int parse_optee_image(image_info_t *image_info,
init_size = image->size;
/*
- * -1 indicates loader decided address; take our pre-mapped area
- * for current image since arm-tf could not allocate memory dynamically
+ * image->load_addr_hi & image->load_addr_lo set to UINT32_MAX indicate
+ * loader decided address; take our pre-mapped area for current image
+ * since arm-tf could not allocate memory dynamically
*/
- if (init_load_addr == -1)
+ if ((image->load_addr_hi == UINT32_MAX) &&
+ (image->load_addr_lo == UINT32_MAX)) {
init_load_addr = image_info->image_base;
+ }
/* Check that the default end address doesn't overflow */
if (check_uptr_overflow(image_info->image_base,
@@ -138,7 +141,8 @@ int parse_optee_header(entry_point_info_t *header_ep,
{
optee_header_t *header;
- int num, ret;
+ uint32_t num;
+ int ret;
assert(header_ep);
header = (optee_header_t *)header_ep->pc;
@@ -181,7 +185,7 @@ int parse_optee_header(entry_point_info_t *header_ep,
}
/* Parse OPTEE image */
- for (num = 0; num < header->nb_images; num++) {
+ for (num = 0U; num < header->nb_images; num++) {
if (header->optee_image_list[num].image_id ==
OPTEE_PAGER_IMAGE_ID) {
ret = parse_optee_image(pager_image_info,