X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fiface-env-inject.c;h=af8ff6d3f072a7fbc3206d85c02c4ec320dac596;hb=2cb41f7db5b9f89113432d6b3daff4807ba8e5f2;hp=af8e5de5e9852c5cc97cea48816c4274feeb5f4f;hpb=07aa8f3c18a33af0961e7546980a63ab5f6fba4f;p=palacios.git

diff --git a/linux_module/iface-env-inject.c b/linux_module/iface-env-inject.c
index af8e5de..af8ff6d 100644
--- a/linux_module/iface-env-inject.c
+++ b/linux_module/iface-env-inject.c
@@ -6,7 +6,6 @@
  */
 
 #include <linux/uaccess.h>
-#include <linux/vmalloc.h>
 
 #include <gears/env_inject.h>
 
@@ -60,7 +59,7 @@ static int vm_env_inject (struct v3_guest * guest, unsigned int cmd, unsigned lo
     }
 
     env = palacios_alloc(sizeof(struct env_data));
-    if (IS_ERR(env)) {
+    if (!env) {
         ERROR("Palacios Error: could not allocate space for environment data\n");
         return -EFAULT;
     }
@@ -74,7 +73,7 @@ static int vm_env_inject (struct v3_guest * guest, unsigned int cmd, unsigned lo
 
     //DEBUG("Palacios: Allocating space for %u env var string ptrs...\n", env->num_strings);
     env->strings = palacios_alloc(env->num_strings*sizeof(char*));
-    if (IS_ERR(env->strings)) {
+    if (!(env->strings)) {
         ERROR("Palacios Error: could not allocate space for env var strings\n");
         return -EFAULT;
     }
@@ -88,7 +87,7 @@ static int vm_env_inject (struct v3_guest * guest, unsigned int cmd, unsigned lo
 
     for (i = 0; i < env->num_strings; i++) {
         char * tmp  = palacios_alloc(MAX_STRING_LEN);
-        if (IS_ERR(tmp)) {
+        if (!(tmp)) {
             ERROR("Palacios Error: could not allocate space for env var string #%d\n", i);
             return -EFAULT;
         }
@@ -133,6 +132,7 @@ static int guest_init_env_inject (struct v3_guest * guest, void ** vm_data) {
 
 static int guest_deinit_env_inject (struct v3_guest * guest, void * vm_data) {
     free_inject_data();
+    remove_guest_ctrl(guest, V3_VM_ENV_INJECT);
     return 0;
 }