struct proc_dir_entry *proc_entry;
static int run_acl(unsigned long ino) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
struct hlist_node *n;
+#endif
struct acl_entry *entry;
hlist_for_each_entry_rcu(entry,
- n, &procprotect_hash[ino & (HASH_SIZE-1)],
- hlist) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
+ n,
+#endif
+ &procprotect_hash[ino & (HASH_SIZE-1)],
+ hlist) {
if (entry->ino==ino) {
return 0;
}
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;
}
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;
&& 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;
struct procprotect_ctx *ctx;
int ret;
- if (!ri) {printk(KERN_CRIT "ri is 0x0");/* Race condition?*/ return 0;}
+ if (!ri || !ri->data) {return 0;}
ctx = (struct procprotect_ctx *) ri->data;
- if (!regs) {
- if (!print_once++) {
- printk(KERN_CRIT "Regs is 0x0");
- }
- return 0;
- }
-
ret = regs->ax;
if (ret==0) {
struct path *p = ctx->path;
- if (!p) {
- if (!print_once++) {
- printk(KERN_CRIT "P is 0x0");
- }
+ if (!p || !p->dentry || !p->dentry->d_inode /* This last check was responsible for the f18 bug*/) {
return 0;
}
- if (!p->dentry) {
- if (!print_once++) {
- printk(KERN_CRIT "P->dentry is 0x0");
- }
- return 0;
- }
-
struct inode *inode = p->dentry->d_inode;
- if (!inode) {
- if (!print_once++) {
- printk(KERN_CRIT "inode is 0x0");
- }
- return 0;
- }
if (!run_acl(inode->i_ino)) {
regs->ax = -EPERM;
}
unregister_kretprobe(&fast_probe);
unregister_kretprobe(&slow_probe);
unregister_jprobe(&dolast_probe);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
struct hlist_node *n;
+#endif
struct acl_entry *entry;
int i;
for (i=0;i<HASH_SIZE;i++) {
hlist_for_each_entry_rcu(entry,
- n, &procprotect_hash[i],
- hlist) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
+ n,
+#endif
+ &procprotect_hash[i],
+ hlist) {
kfree(entry);
}
}