Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1484 from nathan-menhorn/tee-validate-header-603

Browse source 
Update optee_utils.c to fix ARM-software/tf-issues#603
This commit is contained in:
Soby Mathew 2018-09-03 11:29:11 +01:00 • committed by GitHub
commit 100992b531
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/optee/optee_utils.c
View file

@ -25,14 +25,15 @@ typedef struct optee_image {
#define OPTEE_PAGER_IMAGE_ID 0 #define OPTEE_PAGER_IMAGE_ID 0
#define OPTEE_PAGED_IMAGE_ID 1 #define OPTEE_PAGED_IMAGE_ID 1
#define OPTEE_MAX_IMAGE_NUM 2
#define OPTEE_MAX_NUM_IMAGES 2u
#define TEE_MAGIC_NUM_OPTEE 0x4554504f #define TEE_MAGIC_NUM_OPTEE 0x4554504f
/* /*
* magic: header magic number. * magic: header magic number.
* version: OPTEE header version: * version: OPTEE header version:
* 1 - not supported * 1 - not supported
* 2 - supported * 2 - supported
* arch: OPTEE os architecture type: 0 - AARCH32, 1 - AARCH64. * arch: OPTEE os architecture type: 0 - AARCH32, 1 - AARCH64.
* flags: unused currently. * flags: unused currently.
* nb_images: number of images. * nb_images: number of images.
@ -53,14 +54,20 @@ typedef struct optee_header {
******************************************************************************/ ******************************************************************************/
static inline int tee_validate_header(optee_header_t *header) static inline int tee_validate_header(optee_header_t *header)
{ {
int valid = 0;
if ((header->magic == TEE_MAGIC_NUM_OPTEE) && if ((header->magic == TEE_MAGIC_NUM_OPTEE) &&
(header->version == 2) && (header->version == 2u) &&
(header->nb_images <= OPTEE_MAX_IMAGE_NUM)) { (header->nb_images > 0u) &&
return 1; (header->nb_images <= OPTEE_MAX_NUM_IMAGES)) {
valid = 1;
} }
WARN("Not a known TEE, use default loading options.\n"); else {
return 0; WARN("Not a known TEE, use default loading options.\n");
}
return valid;
} }
/******************************************************************************* /*******************************************************************************