Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' into...

[linux-2.6-omap-h63xx.git] / kernel / kprobes.c

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 1b9cbdc0127ad5416aed125ad875badae744d8f8..479d4d5672f9691e7a77143fb586b9a00cff7ed0 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -43,6 +43,7 @@
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/kdebug.h>
+#include <linux/memory.h>
 
 #include <asm-generic/sections.h>
 #include <asm/cacheflush.h>
@@ -123,7 +124,7 @@ static int collect_garbage_slots(void);
 static int __kprobes check_safety(void)
 {
        int ret = 0;
-#if defined(CONFIG_PREEMPT) && defined(CONFIG_PM)
+#if defined(CONFIG_PREEMPT) && defined(CONFIG_FREEZER)
        ret = freeze_processes();
        if (ret == 0) {
                struct task_struct *p, *q;
@@ -699,9 +700,10 @@ int __kprobes register_kprobe(struct kprobe *p)
                goto out;
        }
 
+       mutex_lock(&text_mutex);
        ret = arch_prepare_kprobe(p);
        if (ret)
-               goto out;
+               goto out_unlock_text;
 
        INIT_HLIST_NODE(&p->hlist);
        hlist_add_head_rcu(&p->hlist,
@@ -710,6 +712,8 @@ int __kprobes register_kprobe(struct kprobe *p)
        if (kprobe_enabled)
                arch_arm_kprobe(p);
 
+out_unlock_text:
+       mutex_unlock(&text_mutex);
 out:
        mutex_unlock(&kprobe_mutex);
 
@@ -746,8 +750,11 @@ valid_p:
                 * enabled and not gone - otherwise, the breakpoint would
                 * already have been removed. We save on flushing icache.
                 */
-               if (kprobe_enabled && !kprobe_gone(old_p))
+               if (kprobe_enabled && !kprobe_gone(old_p)) {
+                       mutex_lock(&text_mutex);
                        arch_disarm_kprobe(p);
+                       mutex_unlock(&text_mutex);
+               }
                hlist_del_rcu(&old_p->hlist);
        } else {
                if (p->break_handler && !kprobe_gone(p))
@@ -1280,12 +1287,14 @@ static void __kprobes enable_all_kprobes(void)
        if (kprobe_enabled)
                goto already_enabled;
 
+       mutex_lock(&text_mutex);
        for (i = 0; i < KPROBE_TABLE_SIZE; i++) {
                head = &kprobe_table[i];
                hlist_for_each_entry_rcu(p, node, head, hlist)
                        if (!kprobe_gone(p))
                                arch_arm_kprobe(p);
        }
+       mutex_unlock(&text_mutex);
 
        kprobe_enabled = true;
        printk(KERN_INFO "Kprobes globally enabled\n");
@@ -1310,6 +1319,7 @@ static void __kprobes disable_all_kprobes(void)
 
        kprobe_enabled = false;
        printk(KERN_INFO "Kprobes globally disabled\n");
+       mutex_lock(&text_mutex);
        for (i = 0; i < KPROBE_TABLE_SIZE; i++) {
                head = &kprobe_table[i];
                hlist_for_each_entry_rcu(p, node, head, hlist) {
@@ -1318,6 +1328,7 @@ static void __kprobes disable_all_kprobes(void)
                }
        }
 
+       mutex_unlock(&text_mutex);
        mutex_unlock(&kprobe_mutex);
        /* Allow all currently running kprobes to complete */
        synchronize_sched();