X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=procprotect.c;h=f8ab6e68236ea18bbbdbe48f1eb11081d3cfc2bb;hb=b95f21e08ca45f179b52053eb9cc410cac2bae4e;hp=4763e1713e4c1fbd2f8a18a0e162652ac1fd9313;hpb=e86258a533beb4e2d7e7d0372a1048e88b611a06;p=procprotect.git

diff --git a/procprotect.c b/procprotect.c
index 4763e17..f8ab6e6 100644
--- a/procprotect.c
+++ b/procprotect.c
@@ -28,17 +28,19 @@
 #include <linux/kallsyms.h>
 #include <linux/nsproxy.h>
 
+#include <linux/magic.h>
+#include <linux/slab.h>
+#include <linux/module.h>	/* Specifically, a module */
+#include <linux/kernel.h>	/* We're doing kernel work */
+#include <linux/proc_fs.h>	/* Necessary because we use the proc fs */
+
 #define VERSION_STR "0.0.1"
 
 #ifndef CONFIG_X86_64
 #error "This code does not support your architecture"
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
 static char *aclpath = "procprotect";
-#else
-static char *aclpath __devinitdata = "procprotect";
-#endif
 
 static struct qstr aclqpath;
 
@@ -62,18 +64,17 @@ struct acl_entry {
     struct hlist_node hlist;
 };
 
-#define HASH_SIZE (1<<16)
+#define HASH_SIZE (1<<10)
 
 struct hlist_head procprotect_hash[HASH_SIZE];
 
 struct proc_dir_entry *proc_entry;
 
 static int run_acl(unsigned long ino) {
-    struct hlist_node *n;
     struct acl_entry *entry;
-    hlist_for_each_entry_rcu(entry, 
-            n, &procprotect_hash[ino & (HASH_SIZE-1)],
-            hlist) {
+    hlist_for_each_entry_rcu_notrace(entry, 
+			     &procprotect_hash[ino & (HASH_SIZE-1)],
+			     hlist) {
         if (entry->ino==ino) {
             return 0;
         }
@@ -90,14 +91,13 @@ static int lookup_fast_entry(struct kretprobe_instance *ri, struct pt_regs *regs
     int ret = -1;
     struct procprotect_ctx *ctx;
     struct nameidata *nd = (struct nameidata *) regs->di;
-    struct qstr *q = (struct qstr *) regs->si;
     struct dentry *parent = nd->path.dentry;
     struct inode *pinode = parent->d_inode;
 
     if (pinode->i_sb->s_magic == PROC_SUPER_MAGIC
             && current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) {	
         ctx = (struct procprotect_ctx *) ri->data;
-        ctx->inode = regs->cx;
+        ctx->inode = regs->dx;
         ctx->flags = nd->flags;
         ret = 0;
     }
@@ -131,19 +131,16 @@ static int lookup_slow_entry(struct kretprobe_instance *ri, struct pt_regs *regs
     int ret = -1;
     struct procprotect_ctx *ctx;
     struct nameidata *nd = (struct nameidata *) regs->di;
-    struct qstr *q = (struct qstr *) regs->si;
-    struct path *p = (struct path *) regs->dx;
+    struct path *p = (struct path *) regs->si;
 
     struct dentry *parent = nd->path.dentry;
     struct inode *pinode = parent->d_inode;
 
-    
-
     if (pinode->i_sb->s_magic == PROC_SUPER_MAGIC
             && current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) {	
         
         ctx = (struct procprotect_ctx *) ri->data;
-        ctx->q = q;
+        ctx->q = &nd->last;
         ctx->flags = nd->flags;
         ctx->path = p;
         ret = 0;
@@ -222,6 +219,55 @@ static struct kretprobe slow_probe = {
     .data_size = sizeof(struct procprotect_ctx)
 };
 
+int once_only = 0;
+
+static int init_probes(void) {
+	int ret;
+	dolast_probe.kp.addr = 
+		(kprobe_opcode_t *) kallsyms_lookup_name("do_last");
+
+	if (!dolast_probe.kp.addr) {
+		printk("Couldn't find %s to plant kretprobe\n", "do_last");
+		return -1;
+	}
+
+	if ((ret = register_jprobe(&dolast_probe)) <0) {
+		printk("register_jprobe failed, returned %u\n", ret);
+		return -1;
+	}
+	fast_probe.kp.addr = 
+		(kprobe_opcode_t *) kallsyms_lookup_name("lookup_fast");
+
+	if (!fast_probe.kp.addr) {
+		printk("Couldn't find %s to plant kretprobe\n", "lookup_fast");
+		return -1;
+	}
+
+	slow_probe.kp.addr = 
+		(kprobe_opcode_t *) kallsyms_lookup_name("lookup_slow");
+
+	if (!slow_probe.kp.addr) {
+		printk("Couldn't find %s to plant kretprobe\n", "lookup_slow");
+		return -1;
+	}
+
+	if ((ret = register_kretprobe(&fast_probe)) <0) {
+		printk("register_kretprobe failed, returned %d\n", ret);
+		return -1;
+	}
+
+	printk("Planted kretprobe at %p, handler addr %p\n",
+			fast_probe.kp.addr, fast_probe.handler);
+
+	if ((ret = register_kretprobe(&slow_probe)) <0) {
+		printk("register_kretprobe failed, returned %d\n", ret);
+		return -1;
+	}
+	printk("Planted kretprobe at %p, handler addr %p\n",
+			slow_probe.kp.addr, slow_probe.handler);
+	return 0;
+}
+
 static void add_entry(char *pathname) {
     struct path path;
     if (kern_path(pathname, 0, &path)) {
@@ -246,6 +292,7 @@ static void add_entry(char *pathname) {
             }
         }
     }
+
 }
 
 
@@ -253,15 +300,14 @@ static void __exit procprotect_exit(void)
 {
     unregister_kretprobe(&fast_probe);
     unregister_kretprobe(&slow_probe);
-	unregister_jprobe(&dolast_probe);
-    struct hlist_node *n;
+    unregister_jprobe(&dolast_probe);    
     struct acl_entry *entry;
     int i;
 
     for (i=0;i<HASH_SIZE;i++) {
         hlist_for_each_entry_rcu(entry, 
-                n, &procprotect_hash[i],
-                hlist) {
+				 &procprotect_hash[i],
+				 hlist) {
             kfree(entry);
         }
     }
@@ -288,10 +334,22 @@ int procfile_write(struct file *file, const char *buffer, unsigned long count, v
         pathname[count]='\0';
 
     add_entry(pathname);	
+		
+	if (!once_only) {
+		once_only=1;
+		if (init_probes()==-1)
+			printk(KERN_CRIT "Could not install procprotect probes. Reload module to retry.");
+	}
     printk(KERN_CRIT "Length of buffer=%d",strlen(pathname));
     return count;
 }
 
+static const struct file_operations procprotect_fops = {
+    .owner = THIS_MODULE,
+    .write = procfile_write
+};
+                          
+
 static int __init procprotect_init(void)
 {
     int ret;
@@ -307,51 +365,7 @@ static int __init procprotect_init(void)
     aclqpath.name = aclpath;
     aclqpath.len = strnlen(aclpath, PATH_MAX);
 
-    dolast_probe.kp.addr = 
-        (kprobe_opcode_t *) kallsyms_lookup_name("do_last");
-
-    if (!dolast_probe.kp.addr) {
-        printk("Couldn't find %s to plant kretprobe\n", "do_last");
-        return -1;
-    }
-
-    if ((ret = register_jprobe(&dolast_probe)) <0) {
-                  printk("register_jprobe failed, returned %u\n", ret);
-                  return -1;
-    }
-    fast_probe.kp.addr = 
-        (kprobe_opcode_t *) kallsyms_lookup_name("lookup_fast");
-    if (!fast_probe.kp.addr) {
-        printk("Couldn't find %s to plant kretprobe\n", "lookup_fast");
-        return -1;
-    }
-
-    slow_probe.kp.addr = 
-        (kprobe_opcode_t *) kallsyms_lookup_name("lookup_slow");
-    if (!slow_probe.kp.addr) {
-        printk("Couldn't find %s to plant kretprobe\n", "lookup_slow");
-        return -1;
-    }
-
-    
-
-    if ((ret = register_kretprobe(&fast_probe)) <0) {
-        printk("register_kretprobe failed, returned %d\n", ret);
-        return -1;
-    }
-
-    printk("Planted kretprobe at %p, handler addr %p\n",
-            fast_probe.kp.addr, fast_probe.handler);
-
-    if ((ret = register_kretprobe(&slow_probe)) <0) {
-        printk("register_kretprobe failed, returned %d\n", ret);
-        return -1;
-    }
-    printk("Planted kretprobe at %p, handler addr %p\n",
-            slow_probe.kp.addr, slow_probe.handler);
-
-    proc_entry = create_proc_entry("procprotect", 0644, NULL);
-    proc_entry->write_proc = procfile_write;
+    proc_entry = proc_create("procprotect", 0644, NULL, &procprotect_fops);
 
     return ret;
 }