netfilter: expect: fix crash when putting uninited expectation

[mirror_ubuntu-artful-kernel.git] / kernel / kprobes.c

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index db3cd3e60bdd049a68274675fc78f4a712c3ba04..a1606a4224e14eef5f9e51d5826fa2c6ad75ab32 100644 (file)
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1795,10 +1795,14 @@ int register_jprobe(struct jprobe *jp)
        unsigned long addr, offset;
        struct kprobe *kp = &jp->kp;
 
-       /* Verify probepoint is a function entry point */
+       /*
+        * Verify probepoint as well as the jprobe handler are
+        * valid function entry points.
+        */
        addr = arch_deref_entry_point(jp->entry);
 
-       if (kallsyms_lookup_size_offset(addr, NULL, &offset) && offset == 0) {
+       if (kallsyms_lookup_size_offset(addr, NULL, &offset) && offset == 0 &&
+           kprobe_on_func_entry(kp->addr, kp->symbol_name, kp->offset)) {
                kp->pre_handler = setjmp_pre_handler;
                kp->break_handler = longjmp_break_handler;
                return register_kprobe(kp);