#include <linux/moduleparam.h>
#include <linux/types.h>
#include <linux/kernel.h>
+#include <linux/version.h>
#include <linux/fs_struct.h>
#include <linux/fs.h>
#include <linux/mm.h>
#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;
module_param(aclpath, charp, 0);
/* The kernel is going to honor the request. Here's where we step in */
struct inode *inode = *(ctx->inode);
if (!run_acl(inode->i_ino)) {
- if (current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) {
- regs->ax = -EPERM;
- }
+ regs->ax = -EPERM;
}
}
/* The entry hook ensures that the return hook is only called for
accesses to /proc */
+static int print_once = 0;
+
static int lookup_slow_ret(struct kretprobe_instance *ri, struct pt_regs *regs)
{
- struct procprotect_ctx *ctx = (struct procprotect_ctx *) ri->data;
- int ret = regs->ax;
+ struct procprotect_ctx *ctx;
+ int ret;
+
+ if (!ri || !ri->data) {return 0;}
+ ctx = (struct procprotect_ctx *) ri->data;
+
+ ret = regs->ax;
if (ret==0) {
- /* The kernel is going to honor the request. Here's where we step in */
struct path *p = ctx->path;
+ if (!p || !p->dentry || !p->dentry->d_inode /* This last check was responsible for the f18 bug*/) {
+ return 0;
+ }
struct inode *inode = p->dentry->d_inode;
if (!run_acl(inode->i_ino)) {
- if (current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) {
- regs->ax = -EPERM;
- }
+ regs->ax = -EPERM;
}
}
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();
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]);
}
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) {
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");
- return -1;
- }
-
- if ((ret = register_jprobe(&dolast_probe)) <0) {
- printk("register_jprobe failed, returned %u\n", ret);
- return -1;
- }
+
if ((ret = register_kretprobe(&fast_probe)) <0) {
printk("register_kretprobe failed, returned %d\n", ret);