X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem_hook.c;h=a0753cf65eb8903be3b5848f4a390a5050adc33c;hb=c1e5fa51e4f5b7055c677e2f9d5bc9808a32b351;hp=298bc8fd4fb0c1bea4b59d4dda190690ce1b70b2;hpb=743161062addb38ad8c70c8d84e7ab60325cdb26;p=palacios.git

diff --git a/palacios/src/palacios/vmm_mem_hook.c b/palacios/src/palacios/vmm_mem_hook.c
index 298bc8f..a0753cf 100644
--- a/palacios/src/palacios/vmm_mem_hook.c
+++ b/palacios/src/palacios/vmm_mem_hook.c
@@ -394,7 +394,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);