[FIX] add error checks

diff --git a/ks_features/ks_features.c b/ks_features/ks_features.c
index 50ab3e9..69e0195 100644 (file)
--- a/ks_features/ks_features.c
+++ b/ks_features/ks_features.c
@@ -141,7 +141,8 @@ static int install_features(struct feature *f)
                        set_spt(f, id);
                        int ret = register_syscall(id);
                        if (ret) {
-                               /* TODO: error */
+                               printk("syscall %d install error, ret = %d\n",
+                                      id, ret);
                                return ret;
                        }
                }

diff --git a/parser/us_inst.c b/parser/us_inst.c
index 106ec08..d930966 100644 (file)
--- a/parser/us_inst.c
+++ b/parser/us_inst.c
@@ -58,17 +58,21 @@ static int mod_func_inst(struct func_inst_data *func, struct pf_group *pfg,
 static int mod_lib_inst(struct lib_inst_data *lib, struct pf_group *pfg,
                        enum MOD_TYPE mt)
 {
-       int ret, i;
+       int ret = 0, i;
        struct dentry *dentry;
 
        dentry = dentry_by_path(lib->path);
-       if (dentry == NULL)
+       if (dentry == NULL) {
+               printk("Cannot get dentry by path %s\n", lib->path);
                return -EINVAL;
+       }
 
        for (i = 0; i < lib->cnt_func; ++i) {
                ret = mod_func_inst(lib->func[i], pfg, dentry, mt);
-               if (ret)
+               if (ret) {
+                       printk("Cannot mod func inst, ret = %d\n", ret);
                        return ret;
+               }
        }
 
        return ret;
@@ -105,24 +109,33 @@ static int mod_us_app_inst(struct app_inst_data *app_inst, enum MOD_TYPE mt)
        struct dentry *dentry;
 
        ret = get_pfg_by_app_info(app_inst->app_info, &pfg);
-       if (ret)
+       if (ret) {
+               printk("Cannot get pfg by app info, ret = %d\n", ret);
                return ret;
+       }
 
        for (i = 0; i < app_inst->cnt_func; ++i) {
                /* TODO: */
                dentry = dentry_by_path(app_inst->app_info->exec_path);
-               if (dentry == NULL)
+               if (dentry == NULL) {
+                       printk("Cannot find dentry by path %s\n",
+                              app_inst->app_info->exec_path);
                        return -EINVAL;
+               }
 
                ret = mod_func_inst(app_inst->func[i], pfg, dentry, mt);
-               if (ret)
+               if (ret) {
+                       printk("Cannot mod func inst, ret = \n", ret);
                        return ret;
+               }
        }
 
        for (i = 0; i < app_inst->cnt_lib; ++i) {
                ret = mod_lib_inst(app_inst->lib[i], pfg, mt);
-               if (ret)
+               if (ret) {
+                       printk("Cannot mod lib inst, ret = %d\n", ret);
                        return ret;
+               }
        }
 
        return 0;
@@ -131,7 +144,15 @@ static int mod_us_app_inst(struct app_inst_data *app_inst, enum MOD_TYPE mt)
 int mod_us_inst(struct us_inst_data *us_inst, enum MOD_TYPE mt)
 {
        u32 i;
+       int ret;
+
        for (i = 0; i < us_inst->cnt; ++i) {
-               mod_us_app_inst(us_inst->app_inst[i], mt);
+               ret = mod_us_app_inst(us_inst->app_inst[i], mt);
+               if (ret) {
+                       printk("Cannot mod us app inst, ret = %d\n", ret);
+                       return ret;
+               }
        }
+
+       return 0;
 }

diff --git a/us_manager/img/img_file.c b/us_manager/img/img_file.c
index 1ba2dba..4b56298 100644 (file)
--- a/us_manager/img/img_file.c
+++ b/us_manager/img/img_file.c
@@ -48,8 +48,10 @@ int img_file_add_ip(struct img_file *file, unsigned long addr,
        struct img_ip *ip;
 
        ip = find_img_ip(file, addr);
-       if (ip)
-               return -EINVAL;
+       if (ip) {
+               printk("Warning: ip already exists in img, addr = %p\n", addr);
+               return 0;
+       }
 
        ip = create_img_ip(addr, args);
        img_add_ip_by_list(file, ip);
@@ -62,8 +64,10 @@ int img_file_del_ip(struct img_file *file, unsigned long addr)
        struct img_ip *ip;
 
        ip = find_img_ip(file, addr);
-       if (ip == NULL)
+       if (ip == NULL) {
+               printk("Warning: no ip found in img, addr = %p\n", addr);
                return -EINVAL;
+       }
 
        img_del_ip_by_list(ip);
 

diff --git a/us_manager/img/img_proc.c b/us_manager/img/img_proc.c
index 0c299c4..735bf7f 100644 (file)
--- a/us_manager/img/img_proc.c
+++ b/us_manager/img/img_proc.c
@@ -52,8 +52,10 @@ int img_proc_add_ip(struct img_proc *proc, struct dentry *dentry,
        file = create_img_file(dentry);
 
        ret = img_file_add_ip(file, addr, args);
-       if (ret)
+       if (ret) {
+               printk("Cannot add ip to img file\n");
                free_img_file(file);
+       }
        else
                img_add_file_by_list(proc, file);