core: Fix error handling of MMCONFIG setup

If we have an MMCONFIG region, we must either successfully map it or
fail the initialization. Succeeding without setting up pci_space will
cause crashes later on when accessing it on behalf of a cell.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/hypervisor/pci.c b/hypervisor/pci.c
index ecd0e7d3f5db797a236abb05dfc8960b1d6a178d..c9acca24a8469c30dc1904a9830b6303cfbf1b52 100644 (file)
--- a/hypervisor/pci.c
+++ b/hypervisor/pci.c
@@ -173,14 +173,14 @@ int pci_init(void)
        pci_mmcfg_size = (mcfg->alloc_structs[0].end_bus -
                          mcfg->alloc_structs[0].start_bus) * 256 * 4096;
        pci_space = page_alloc(&remap_pool, pci_mmcfg_size / PAGE_SIZE);
-       if (pci_space)
-               page_map_create(&hv_paging_structs,
-                               mcfg->alloc_structs[0].base_addr,
-                               pci_mmcfg_size, (unsigned long)pci_space,
-                               PAGE_DEFAULT_FLAGS | PAGE_FLAG_UNCACHED,
-                               PAGE_MAP_NON_COHERENT);
-
-       return 0;
+       if (!pci_space)
+               return -ENOMEM;
+
+       return page_map_create(&hv_paging_structs,
+                              mcfg->alloc_structs[0].base_addr,
+                              pci_mmcfg_size, (unsigned long)pci_space,
+                              PAGE_DEFAULT_FLAGS | PAGE_FLAG_UNCACHED,
+                              PAGE_MAP_NON_COHERENT);
 }
 
 /**