X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=procprotect.c;h=88e88beb2aeee1f0d678dc7a0db6eea953392b85;hb=2e88758926e7c4560f2255b4aeb6a95bbeb5460f;hp=30497f4fb77e0c9973aede7b5ad6688611349c42;hpb=f1ced54bed3ef5efe0e3b4dbe77fedbb9a3c450c;p=procprotect.git

diff --git a/procprotect.c b/procprotect.c
index 30497f4..88e88be 100644
--- a/procprotect.c
+++ b/procprotect.c
@@ -46,6 +46,7 @@ MODULE_VERSION(VERSION_STR);
 
 struct procprotect_ctx {
     struct inode **inode;
+    struct qstr *q;
     struct path *path;
     int flags;
 };
@@ -111,17 +112,8 @@ static int lookup_fast_ret(struct kretprobe_instance *ri, struct pt_regs *regs)
     if (ret==0) {
         /* The kernel is going to honor the request. Here's where we step in */
         struct inode *inode = *(ctx->inode);
-        printk(KERN_CRIT "Inode=%u",inode->i_ino);
         if (!run_acl(inode->i_ino)) {
-            if (current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) {
-                regs->ax = -EPERM;
-            }
-        }
-    }
-    else if (ret==1) {
-        if (!printed) {
-            dump_stack();
-            printed=1;
+            regs->ax = -EPERM;
         }
     }
 
@@ -139,10 +131,13 @@ static int lookup_slow_entry(struct kretprobe_instance *ri, struct pt_regs *regs
     struct dentry *parent = nd->path.dentry;
     struct inode *pinode = parent->d_inode;
 
-    printk(KERN_CRIT "Entered lookup slow");
+    
+
     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->flags = nd->flags;
         ctx->path = p;
         ret = 0;
@@ -161,13 +156,14 @@ static int lookup_slow_ret(struct kretprobe_instance *ri, struct pt_regs *regs)
 
     if (ret==0) {
         /* The kernel is going to honor the request. Here's where we step in */
+        /*struct qstr *q = ctx->q;
+        if (!strncmp(q->name,"sysrq-trigger",13)) {
+            printk(KERN_CRIT "lookup_slow sysrqtrigger");
+        }*/
         struct path *p = ctx->path;
         struct inode *inode = p->dentry->d_inode;
-        printk(KERN_CRIT "Looking at inode %x",inode);
         if (!run_acl(inode->i_ino)) {
-            if (current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) {
-                regs->ax = -EPERM;
-            }
+            regs->ax = -EPERM;
         }
     }
 
@@ -181,12 +177,17 @@ struct open_flags {
   int intent;
 };
 
-static struct file *do_last_probe(struct nameidata *nd, struct path *path,
+static struct file *do_last_probe(struct nameidata *nd, struct path *path, struct file *file,
                          struct open_flags *op, const char *pathname) {
     struct dentry *parent = nd->path.dentry;
     struct inode *pinode = parent->d_inode;
+    struct qstr *q = &nd->last;
 
+    
     if (pinode->i_sb->s_magic == PROC_SUPER_MAGIC && current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) {
+        /*if (!strncmp(q->name,"sysrq-trigger",13)) {
+            printk(KERN_CRIT "do_last sysrqtrigger: %d",op->open_flag);
+        }*/
         op->open_flag &= ~O_CREAT;
     }
     jprobe_return();
@@ -240,6 +241,7 @@ static void add_entry(char *pathname) {
 static void __exit procprotect_exit(void)
 {
     unregister_kretprobe(&fast_probe);
+    unregister_kretprobe(&slow_probe);
 	unregister_jprobe(&dolast_probe);
     struct hlist_node *n;
     struct acl_entry *entry;
@@ -281,11 +283,12 @@ int procfile_write(struct file *file, const char *buffer, unsigned long count, v
 
 static int __init procprotect_init(void)
 {
-    printk("Procprotect: starting procprotect version %s with ACLs at path %s.\n",
-            VERSION_STR, aclpath);
     int ret;
     int i;
 
+    printk("Procprotect: starting procprotect version %s with ACLs at path %s.\n",
+            VERSION_STR, aclpath);
+
     for(i=0;i<HASH_SIZE;i++) {
         INIT_HLIST_HEAD(&procprotect_hash[i]);
     }
@@ -293,6 +296,18 @@ 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) {
@@ -300,34 +315,29 @@ static int __init procprotect_init(void)
         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;
     }
-    */
 
-    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");
+    if ((ret = register_kretprobe(&fast_probe)) <0) {
+        printk("register_kretprobe failed, returned %d\n", ret);
         return -1;
     }
 
-    if ((ret = register_jprobe(&dolast_probe)) <0) {
-                  printk("register_jprobe failed, returned %u\n", ret);
-                  return -1;
-    }
+    printk("Planted kretprobe at %p, handler addr %p\n",
+            fast_probe.kp.addr, fast_probe.handler);
 
-    if ((ret = register_kretprobe(&fast_probe)) <0) {
+    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",
-            fast_probe.kp.addr, fast_probe.handler);
+            slow_probe.kp.addr, slow_probe.handler);
 
     proc_entry = create_proc_entry("procprotect", 0644, NULL);
     proc_entry->write_proc = procfile_write;