Merge tag 'staging-4.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[karo-tx-linux.git] / kernel / extable.c

diff --git a/kernel/extable.c b/kernel/extable.c
index e1359474baa5a55288a37386f290cb68b61ddd85..2676d7f8baf6ea61b5eec9272786bc964b0cf195 100644 (file)
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@ -17,10 +17,12 @@
 */
 #include <linux/ftrace.h>
 #include <linux/memory.h>
+#include <linux/extable.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/kprobes.h>
+#include <linux/filter.h>
 
 #include <asm/sections.h>
 #include <linux/uaccess.h>
@@ -107,6 +109,8 @@ int __kernel_text_address(unsigned long addr)
                return 1;
        if (is_kprobe_optinsn_slot(addr) || is_kprobe_insn_slot(addr))
                return 1;
+       if (is_bpf_text_address(addr))
+               return 1;
        /*
         * There might be init symbols in saved stacktraces.
         * Give those symbols a chance to be printed in
@@ -130,6 +134,8 @@ int kernel_text_address(unsigned long addr)
                return 1;
        if (is_kprobe_optinsn_slot(addr) || is_kprobe_insn_slot(addr))
                return 1;
+       if (is_bpf_text_address(addr))
+               return 1;
        return 0;
 }