#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
-static char *aclpath __devinitdata = "procprotect";
+static char *aclpath = "procprotect";
+
static struct qstr aclqpath;
module_param(aclpath, charp, 0);
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) {
+ &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;
/* 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 qstr *q = ctx->q;
- if (!strncmp(q->name,"sysrq-trigger",13)) {
- printk(KERN_CRIT "lookup_slow sysrqtrigger");
- }*/
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)) {
regs->ax = -EPERM;
unregister_kretprobe(&fast_probe);
unregister_kretprobe(&slow_probe);
unregister_jprobe(&dolast_probe);
- struct hlist_node *n;
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);
}
}
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]);
}
proc_entry = create_proc_entry("procprotect", 0644, NULL);
proc_entry->write_proc = procfile_write;
+ add_entry("/proc/sysrq-trigger");
return ret;
}