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

fix(el3-spmc): prevent total_page_count overflow

Browse source 
size_t is not guaranteed to be 64 bits, although it happens to be 64
bits on all systems that el3-spmc supports.

Change-Id: Ieae11722a15448641de50233597ac35869eab574
Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
This commit is contained in:
Demi Marie Obenour 2023-01-12 13:24:50 -05:00
parent a0f3b552cf
commit 2d4da8e265
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/std_svc/spm/el3_spmc/spmc_shared_mem.c
View file

@ -799,7 +799,7 @@ static int spmc_shmem_check_obj(struct spmc_shmem_obj *obj,
size_t size; size_t size;
size_t count; size_t count;
size_t expected_size; size_t expected_size;
size_t total_page_count; uint64_t total_page_count;
size_t emad_size; size_t emad_size;
size_t header_emad_size; size_t header_emad_size;
uint32_t offset; uint32_t offset;
@ -894,7 +894,7 @@ static int spmc_shmem_check_obj(struct spmc_shmem_obj *obj,
comp->address_range_array[i].page_count; comp->address_range_array[i].page_count;
} }
if (comp->total_page_count != total_page_count) { if (comp->total_page_count != total_page_count) {
WARN("%s: invalid object, desc total_page_count %u != %zu\n", WARN("%s: invalid object, desc total_page_count %u != %" PRIu64 "\n",
__func__, comp->total_page_count, __func__, comp->total_page_count,
total_page_count); total_page_count);
return -EINVAL; return -EINVAL;