X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=procprotect.c;h=741a7999081b8544059c35f02f004b003ebcce38;hb=66d7e95bfabaed2fc2ff8e15d9e357b30cf00498;hp=42166f5b59a40c1b0a0c1b4f2f86ea3ea5a6f777;hpb=194681285be4f9c75d02cc11d83f46cd3f56cb0a;p=procprotect.git diff --git a/procprotect.c b/procprotect.c index 42166f5..741a799 100644 --- a/procprotect.c +++ b/procprotect.c @@ -91,8 +91,14 @@ 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 dentry *parent = nd->path.dentry; - struct inode *pinode = parent->d_inode; + struct dentry *parent; + struct inode *pinode; + + if (!nd) return; + parent = nd->path.dentry; + + if (!parent) return; + pinode = parent->d_inode; if (pinode->i_sb->s_magic == PROC_SUPER_MAGIC && current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) { @@ -132,9 +138,13 @@ static int lookup_slow_entry(struct kretprobe_instance *ri, struct pt_regs *regs struct procprotect_ctx *ctx; struct nameidata *nd = (struct nameidata *) regs->di; struct path *p = (struct path *) regs->si; + struct dentry *parent; + struct inode *pinode; - struct dentry *parent = nd->path.dentry; - struct inode *pinode = parent->d_inode; + if (!nd) return; + parent = nd->path.dentry; + if (!parent) return; + pinode= parent->d_inode; if (pinode->i_sb->s_magic == PROC_SUPER_MAGIC && current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) { @@ -293,11 +303,6 @@ static void add_entry(char *pathname) { } } - if (!once_only) { - once_only=1; - if (init_probes()==-1) - printk(KERN_CRIT "Could not install procprotect probes. Reload module to retry."); - } } @@ -339,6 +344,12 @@ 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; }