andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes from topic "ffa_el3_spmc" into integration 

* changes:
  fix(spmc): fix incorrect FF-A version usage
  fix(spmc): fix FF-A memory transaction validation
This commit is contained in:
Olivier Deprez 2022-05-24 15:04:16 +02:00 committed by TrustedFirmware Code Review
parent 453abc80b2 25eb2d41a6
commit f7ad743470
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

@ -304,7 +304,7 @@ overlapping_memory_regions(struct ffa_comp_mrd *region1,
if ((region1_start >= region2_start &&
region1_start < region2_end) ||
(region1_end >= region2_start
(region1_end > region2_start
&& region1_end < region2_end)) {
WARN("Overlapping mem regions 0x%lx-0x%lx & 0x%lx-0x%lx\n",
region1_start, region1_end,
@ -815,7 +815,7 @@ static int spmc_shmem_check_state_obj(struct spmc_shmem_obj *obj,
if ((obj->desc.handle != inflight_obj->desc.handle) &&
(obj->desc_size == obj->desc_filled)) {
other_mrd = spmc_shmem_obj_get_comp_mrd(inflight_obj,
ffa_version);
FFA_VERSION_COMPILED);
if (other_mrd == NULL) {
return -EINVAL;
}