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

Merge "fix(tsp): loop / crash if mmap of region fails" into integration

Browse source
This commit is contained in:
Manish V Badarkhe 2023-02-10 16:11:05 +01:00 • committed by TrustedFirmware Code Review
commit ec1c00a79c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bl32/tsp/tsp_ffa_main.c
View file

@ -201,7 +201,7 @@ static int test_memory_send(ffa_endpoint_id16_t sender, uint64_t handle,
/* Only expecting to be sent memory from NWd so map accordingly. */ /* Only expecting to be sent memory from NWd so map accordingly. */
mem_attrs |= MT_NS; mem_attrs |= MT_NS;
for (uint32_t i = 0U; i < composite->address_range_count; i++) { for (int32_t i = 0; i < (int32_t)composite->address_range_count; i++) {
size_t size = composite->address_range_array[i].page_count * PAGE_SIZE; size_t size = composite->address_range_array[i].page_count * PAGE_SIZE;
ptr = (char *) composite->address_range_array[i].address; ptr = (char *) composite->address_range_array[i].address;
@ -211,7 +211,7 @@ static int test_memory_send(ffa_endpoint_id16_t sender, uint64_t handle,
size, mem_attrs); size, mem_attrs);
if (ret != 0) { if (ret != 0) {
ERROR("Failed [%u] mmap_add_dynamic_region %u (%lx) (%lx) (%x)!\n", ERROR("Failed [%d] mmap_add_dynamic_region %u (%lx) (%lx) (%x)!\n",
i, ret, i, ret,
(uint64_t)composite->address_range_array[i].address, (uint64_t)composite->address_range_array[i].address,
size, mem_attrs); size, mem_attrs);