diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-06-26 09:54:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-26 09:54:24 +0100 |
| commit | ccf3911108ea817a53f6e3b33526881d397ef442 (patch) | |
| tree | e3ad11342a503d2b3d25a9c21c8da47280b57e45 /bl1 | |
| parent | 73e11b4321fa8b0d7032175e1ddf65a4a320847c (diff) | |
| parent | 3ec5204c49ddbc5c1142eda28106a572ca9ed9eb (diff) | |
Merge pull request #994 from soby-mathew/sm/fwu_fix
Fix FWU and cache helper optimization
Diffstat (limited to 'bl1')
| -rw-r--r-- | bl1/bl1_fwu.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 205ea922..85eee1ad 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -176,18 +176,19 @@ static int bl1_fwu_image_check_overlaps(int image_id) checked_image_base = checked_info->image_base; checked_image_end = checked_image_base + checked_info->image_size - 1; - /* No need to check for overlaps, it's done in bl1_fwu_image_copy(). */ + /* No need to check for overflows, it's done in bl1_fwu_image_copy(). */ for (int i = 0; i < FWU_MAX_SIMULTANEOUS_IMAGES; i++) { - /* Don't check image against itself. */ - if (bl1_fwu_loaded_ids[i] == image_id) + /* Skip INVALID_IMAGE_IDs and don't check image against itself */ + if ((bl1_fwu_loaded_ids[i] == INVALID_IMAGE_ID) || + (bl1_fwu_loaded_ids[i] == image_id)) continue; image_desc = bl1_plat_get_image_desc(bl1_fwu_loaded_ids[i]); /* Only check images that are loaded or being loaded. */ - assert (image_desc->state != IMAGE_STATE_RESET); + assert (image_desc && image_desc->state != IMAGE_STATE_RESET); info = &image_desc->image_info; @@ -704,11 +705,15 @@ static int bl1_fwu_image_reset(unsigned int image_id, unsigned int flags) return -EPERM; } - /* Clear the memory.*/ - zero_normalmem((void *)image_desc->image_info.image_base, - image_desc->copied_size); - flush_dcache_range(image_desc->image_info.image_base, - image_desc->copied_size); + if (image_desc->copied_size) { + /* Clear the memory if the image is copied */ + assert(GET_SECURITY_STATE(image_desc->ep_info.h.attr) == SECURE); + + zero_normalmem((void *)image_desc->image_info.image_base, + image_desc->copied_size); + flush_dcache_range(image_desc->image_info.image_base, + image_desc->copied_size); + } /* Reset status variables */ image_desc->copied_size = 0; |