git://git.onelab.eu
/
procprotect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Thomas Dreibholtz for compatibility with kernel 3.10
[procprotect.git]
/
procprotect.c
diff --git
a/procprotect.c
b/procprotect.c
index
dc2d4e4
..
e8c639d
100644
(file)
--- a/
procprotect.c
+++ b/
procprotect.c
@@
-28,17
+28,19
@@
#include <linux/kallsyms.h>
#include <linux/nsproxy.h>
#include <linux/kallsyms.h>
#include <linux/nsproxy.h>
+#include <linux/magic.h>
+#include <linux/slab.h>
+#include <linux/module.h> /* Specifically, a module */
+#include <linux/kernel.h> /* We're doing kernel work */
+#include <linux/proc_fs.h> /* Necessary because we use the proc fs */
+
#define VERSION_STR "0.0.1"
#ifndef CONFIG_X86_64
#error "This code does not support your architecture"
#endif
#define VERSION_STR "0.0.1"
#ifndef CONFIG_X86_64
#error "This code does not support your architecture"
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
static char *aclpath = "procprotect";
static char *aclpath = "procprotect";
-#else
-static char *aclpath __devinitdata = "procprotect";
-#endif
static struct qstr aclqpath;
static struct qstr aclqpath;
@@
-69,14
+71,8
@@
struct hlist_head procprotect_hash[HASH_SIZE];
struct proc_dir_entry *proc_entry;
static int run_acl(unsigned long ino) {
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,
struct acl_entry *entry;
hlist_for_each_entry_rcu(entry,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
- n,
-#endif
&procprotect_hash[ino & (HASH_SIZE-1)],
hlist) {
if (entry->ino==ino) {
&procprotect_hash[ino & (HASH_SIZE-1)],
hlist) {
if (entry->ino==ino) {
@@
-140,8
+136,6
@@
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;
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) {
if (pinode->i_sb->s_magic == PROC_SUPER_MAGIC
&& current->nsproxy->mnt_ns!=init_task.nsproxy->mnt_ns) {
@@
-256,18
+250,12
@@
static void __exit procprotect_exit(void)
{
unregister_kretprobe(&fast_probe);
unregister_kretprobe(&slow_probe);
{
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
+ unregister_jprobe(&dolast_probe);
struct acl_entry *entry;
int i;
for (i=0;i<HASH_SIZE;i++) {
hlist_for_each_entry_rcu(entry,
struct acl_entry *entry;
int i;
for (i=0;i<HASH_SIZE;i++) {
hlist_for_each_entry_rcu(entry,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0)
- n,
-#endif
&procprotect_hash[i],
hlist) {
kfree(entry);
&procprotect_hash[i],
hlist) {
kfree(entry);
@@
-300,6
+288,11
@@
int procfile_write(struct file *file, const char *buffer, unsigned long count, v
return count;
}
return count;
}
+static const struct file_operations procprotect_fops = {
+ .owner = THIS_MODULE,
+ .write = procfile_write
+};
+
static int __init procprotect_init(void)
{
int ret;
static int __init procprotect_init(void)
{
int ret;
@@
-329,6
+322,7
@@
static int __init procprotect_init(void)
}
fast_probe.kp.addr =
(kprobe_opcode_t *) kallsyms_lookup_name("lookup_fast");
}
fast_probe.kp.addr =
(kprobe_opcode_t *) kallsyms_lookup_name("lookup_fast");
+
if (!fast_probe.kp.addr) {
printk("Couldn't find %s to plant kretprobe\n", "lookup_fast");
return -1;
if (!fast_probe.kp.addr) {
printk("Couldn't find %s to plant kretprobe\n", "lookup_fast");
return -1;
@@
-336,6
+330,7
@@
static int __init procprotect_init(void)
slow_probe.kp.addr =
(kprobe_opcode_t *) kallsyms_lookup_name("lookup_slow");
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;
if (!slow_probe.kp.addr) {
printk("Couldn't find %s to plant kretprobe\n", "lookup_slow");
return -1;
@@
-358,9
+353,9
@@
static int __init procprotect_init(void)
printk("Planted kretprobe at %p, handler addr %p\n",
slow_probe.kp.addr, slow_probe.handler);
printk("Planted kretprobe at %p, handler addr %p\n",
slow_probe.kp.addr, slow_probe.handler);
- proc_entry = create_proc_entry("procprotect", 0644, NULL);
- proc_entry->write_proc = procfile_write;
+ proc_entry = proc_create("procprotect", 0644, NULL, &procprotect_fops);
+ add_entry("/proc/sysrq-trigger");
return ret;
}
return ret;
}