SPM: Ignore empty regions in resource description
authorAntonio Nino Diaz <antonio.ninodiaz@arm.com>
Fri, 29 Mar 2019 13:48:50 +0000 (13:48 +0000)
committerAntonio Nino Diaz <antonio.ninodiaz@arm.com>
Tue, 2 Apr 2019 13:52:55 +0000 (14:52 +0100)
Instead of letting the code run until another error is reached, return
early.

Change-Id: I6277a8c65101d3e39b0540099c2a3063584a7dbd
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
services/std_svc/spm/spm_xlat.c

index 57ad742453a2f7493977f377ecfb607c30ccd4fa..5f83096507c9b68ce9861000d64174acb24aadd9 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -159,6 +159,11 @@ static void map_rdmem(sp_context_t *sp_ctx, struct sp_rd_sect_mem_region *rdmem)
 
        unsigned int memtype = rdmem->attr & RD_MEM_MASK;
 
+       if (rd_size == 0U) {
+               VERBOSE("Memory region '%s' is empty. Ignored.\n", rdmem->name);
+               return;
+       }
+
        VERBOSE("Adding memory region '%s'\n", rdmem->name);
 
        mmap.granularity = REGION_DEFAULT_GRANULARITY;