kprobes: Support NOKPROBE_SYMBOL() in modules

[platform/kernel/linux-rpi.git] / kernel / kprobes.c

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index b754999..9eb5acf 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -2192,6 +2192,11 @@ static void kprobe_remove_area_blacklist(unsigned long start, unsigned long end)
        }
 }
 
+static void kprobe_remove_ksym_blacklist(unsigned long entry)
+{
+       kprobe_remove_area_blacklist(entry, entry + 1);
+}
+
 int __init __weak arch_populate_kprobe_blacklist(void)
 {
        return 0;
@@ -2231,6 +2236,12 @@ static int __init populate_kprobe_blacklist(unsigned long *start,
 static void add_module_kprobe_blacklist(struct module *mod)
 {
        unsigned long start, end;
+       int i;
+
+       if (mod->kprobe_blacklist) {
+               for (i = 0; i < mod->num_kprobe_blacklist; i++)
+                       kprobe_add_ksym_blacklist(mod->kprobe_blacklist[i]);
+       }
 
        start = (unsigned long)mod->kprobes_text_start;
        if (start) {
@@ -2242,6 +2253,12 @@ static void add_module_kprobe_blacklist(struct module *mod)
 static void remove_module_kprobe_blacklist(struct module *mod)
 {
        unsigned long start, end;
+       int i;
+
+       if (mod->kprobe_blacklist) {
+               for (i = 0; i < mod->num_kprobe_blacklist; i++)
+                       kprobe_remove_ksym_blacklist(mod->kprobe_blacklist[i]);
+       }
 
        start = (unsigned long)mod->kprobes_text_start;
        if (start) {