Fixed major palacios barrier implementation error with potentially serious implicatio...

[palacios.releases.git] / palacios / src / palacios / vmm_direct_paging_32pae.h

diff --git a/palacios/src/palacios/vmm_direct_paging_32pae.h b/palacios/src/palacios/vmm_direct_paging_32pae.h
index 0c3381a..ca32a84 100644 (file)
--- a/palacios/src/palacios/vmm_direct_paging_32pae.h
+++ b/palacios/src/palacios/vmm_direct_paging_32pae.h
@@ -40,16 +40,14 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
     int pde_index = PDE32PAE_INDEX(fault_addr);
     int pte_index = PTE32PAE_INDEX(fault_addr);
 
-    struct v3_shadow_region * region =  v3_get_shadow_region(info->vm_info, info->cpu_id, fault_addr);
+    struct v3_mem_region * region =  v3_get_mem_region(info->vm_info, info->vcpu_id, fault_addr);
   
     if (region == NULL) {
-       PrintError("Invalid region in passthrough page fault 32PAE, addr=%p\n", 
+       PrintError(info->vm_info, info, "Invalid region in passthrough page fault 32PAE, addr=%p\n", 
                   (void *)fault_addr);
        return -1;
     }
 
-    host_addr = v3_get_shadow_addr(region, info->cpu_id, fault_addr);
-
     // Lookup the correct PDPE address based on the PAGING MODE
     if (info->shdw_pg_mode == SHADOW_PAGING) {
        pdpe = CR3_TO_PDPE32PAE_VA(info->ctrl_regs.cr3);
@@ -98,14 +96,17 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
                pte[pte_index].writable = 0;
            }
 
+           if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
+               PrintError(info->vm_info, info, "Could not translate fault address (%p)\n", (void *)fault_addr);
+               return -1;
+           }
+
            pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
+       } else {
+           return region->unhandled(info, fault_addr, fault_addr, region, error_code);
        }
-    }
-   
-    if (region->flags.hook == 1) {
-       if ((error_code.write == 1) || (region->flags.read == 0)) {
-           return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code);
-       }
+    } else {
+       return region->unhandled(info, fault_addr, fault_addr, region, error_code);
     }
 
     return 0;