]> git.baikalelectronics.ru Git - arm-tf.git/commitdiff
fix(spmc): fix FF-A memory transaction validation
authorMarc Bonnici <marc.bonnici@arm.com>
Fri, 20 May 2022 13:34:56 +0000 (14:34 +0100)
committerMarc Bonnici <marc.bonnici@arm.com>
Fri, 20 May 2022 13:34:56 +0000 (14:34 +0100)
Fix an incorrect bound check for overlapping memory regions which can
give false positives if the two regions are consecutive to each other.

Signed-off-by: Marc Bonnici <marc.bonnici@arm.com>
Change-Id: I997dc4d1ef2014660cc964aff0a73e348c44eff0

services/std_svc/spm/el3_spmc/spmc_shared_mem.c

index 1602981bf31f33272e3fce214191f327bcee2d67..98d069ac9f2e65eee2d6e283cfcaf0408b1ac246 100644 (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,