patch for v3_dump_mem print output

[palacios.releases.git] / palacios / src / palacios / vmm_mem_hook.c

diff --git a/palacios/src/palacios/vmm_mem_hook.c b/palacios/src/palacios/vmm_mem_hook.c
index 298bc8f..ef2ff34 100644 (file)
--- a/palacios/src/palacios/vmm_mem_hook.c
+++ b/palacios/src/palacios/vmm_mem_hook.c
@@ -52,10 +52,28 @@ static int mem_eq_fn(addr_t key1, addr_t key2) {
 }
 
 int v3_init_mem_hooks(struct v3_vm_info * vm) {
+    void *temp;
+
     struct v3_mem_hooks * hooks = &(vm->mem_hooks);
 
-    hooks->hook_hvas_1 = V3_VAddr(V3_AllocPages(vm->num_cores));
-    hooks->hook_hvas_2 = V3_VAddr(V3_AllocPages(vm->num_cores));
+    temp = V3_AllocPages(vm->num_cores);
+
+    if (!temp) {
+       PrintError("Cannot allocate space for mem hooks\n");
+       return -1;
+    }
+
+    hooks->hook_hvas_1 = V3_VAddr(temp);
+
+    temp = V3_AllocPages(vm->num_cores);
+
+    if (!temp) {
+       PrintError("Cannot allocate space for mem hooks\n");
+       V3_FreePages(hooks->hook_hvas_1,vm->num_cores);
+       return -1;
+    }
+
+    hooks->hook_hvas_2 = V3_VAddr(temp);
 
     INIT_LIST_HEAD(&(hooks->hook_list));
 
@@ -240,6 +258,11 @@ static int handle_mem_hook(struct guest_info * core, addr_t guest_va, addr_t gue
 
     mem_op_size = ((uint_t)src_req_size < (uint_t)dst_req_size) ? src_req_size : dst_req_size;
 
+    if (mem_op_size == -1) {
+       PrintError("Error: Did not detect any memory operands...\n");
+       return -1;
+    }
+
 
     /* Now handle the hooks if necessary */    
     if ( (src_hook != NULL)  && (src_hook->read != NULL) &&
@@ -312,6 +335,11 @@ int v3_hook_write_mem(struct v3_vm_info * vm, uint16_t core_id,
     struct mem_hook * hook = V3_Malloc(sizeof(struct mem_hook));
     struct v3_mem_hooks * hooks = &(vm->mem_hooks);
 
+    if (!hook) {
+       PrintError("Cannot allocate in hooking memory for full access\n");
+       return -1;
+    }
+
     memset(hook, 0, sizeof(struct mem_hook));
 
     hook->write = write;
@@ -354,6 +382,11 @@ int v3_hook_full_mem(struct v3_vm_info * vm, uint16_t core_id,
     struct mem_hook * hook = V3_Malloc(sizeof(struct mem_hook));
     struct v3_mem_hooks * hooks = &(vm->mem_hooks);
 
+    if (!hook) {
+       PrintError("Cannot allocate in hooking memory for writing\n");
+       return -1;
+    }
+
     memset(hook, 0, sizeof(struct mem_hook));
 
     hook->write = write;
@@ -361,12 +394,20 @@ int v3_hook_full_mem(struct v3_vm_info * vm, uint16_t core_id,
     hook->priv_data = priv_data;
 
     entry = v3_create_mem_region(vm, core_id, guest_addr_start, guest_addr_end);
+
+    if (!entry) {
+       PrintError("Cannot create memory region\n");
+       V3_Free(hook);
+       return -1;
+    }
+
     hook->region = entry;
 
     entry->unhandled = handle_mem_hook;
     entry->priv_data = hook;
 
     if (v3_insert_mem_region(vm, entry)) {
+       PrintError("Cannot insert memory region\n");
        V3_Free(entry);
        V3_Free(hook);
        return -1;
@@ -394,7 +435,20 @@ static int free_hook(struct v3_vm_info * vm, struct mem_hook * hook) {
 // We do not support unhooking subregions
 int v3_unhook_mem(struct v3_vm_info * vm, uint16_t core_id, addr_t guest_addr_start) {
     struct v3_mem_region * reg = v3_get_mem_region(vm, core_id, guest_addr_start);
-    struct mem_hook * hook = reg->priv_data;
+    struct mem_hook * hook = NULL;
+
+    if (reg == NULL) {
+       PrintError("Could not find region at %p\n", (void *)guest_addr_start);
+       return -1;
+    }
+
+    hook = reg->priv_data;
+
+    if (hook == NULL) {
+       PrintError("Trying to unhook region that is not a hook at %p\n", (void *)guest_addr_start);
+       return -1;
+    }
+
 
     free_hook(vm, hook);