Merge patch-axel-25

Hensoldt-Cyber · Mar 29, 2023 · 02c967a · 02c967a
2 parents 50c2dbe + 482a700
commit 02c967a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/components/Init/src/main.c b/components/Init/src/main.c
@@ -198,7 +198,9 @@ void pre_init(void)
     }
 
     /* add untyped mmios */
-    for (int i = 0; i < simple_get_untyped_count(&camkes_simple); i++) {
+    int cnt = simple_get_untyped_count(&camkes_simple);
+    assert(cnt >= 0); /* This shall never fail. */
+    for (int i = 0; i < cnt; i++) {
         size_t size;
         uintptr_t paddr;
         bool device;

diff --git a/components/VM_Arm/src/main.c b/components/VM_Arm/src/main.c
@@ -495,7 +495,9 @@ static int vmm_init(const vm_config_t *vm_config)
     utspace_alloc_at_copy = vka->utspace_alloc_at;
     vka->utspace_alloc_at = camkes_vm_utspace_alloc_at;
 
-    for (int i = 0; i < simple_get_untyped_count(simple); i++) {
+    int cnt = simple_get_untyped_count(simple);
+    assert(cnt >= 0); /* This shall never fail. */
+    for (int i = 0; i < cnt; i++) {
         size_t size_bits;
         uintptr_t paddr;
         bool is_device;
@@ -505,7 +507,9 @@ static int vmm_init(const vm_config_t *vm_config)
     }
 
     if (camkes_dtb_untyped_count) {
-        for (int i = 0; i < camkes_dtb_untyped_count(); i++) {
+        cnt = camkes_dtb_untyped_count();
+        assert(cnt >= 0); /* This shall never fail. */
+        for (int i = 0; i < cnt; i++) {
             size_t size_bits;
             uintptr_t paddr;
             seL4_CPtr cap = camkes_dtb_get_nth_untyped(i, &size_bits, &paddr);