Merge tag 'audit-pr-20200226' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[linux.git] / kernel / extable.c

diff --git a/kernel/extable.c b/kernel/extable.c
index f6920a11e28a5500e0606bbdd74b626cb477db07..a0024f27d3a1d413232d01d6416fe903585c585e 100644 (file)
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@ -131,8 +131,9 @@ int kernel_text_address(unsigned long addr)
         * triggers a stack trace, or a WARN() that happens during
         * coming back from idle, or cpu on or offlining.
         *
-        * is_module_text_address() as well as the kprobe slots
-        * and is_bpf_text_address() require RCU to be watching.
+        * is_module_text_address() as well as the kprobe slots,
+        * is_bpf_text_address() and is_bpf_image_address require
+        * RCU to be watching.
         */
        no_rcu = !rcu_is_watching();
 
@@ -148,6 +149,8 @@ int kernel_text_address(unsigned long addr)
                goto out;
        if (is_bpf_text_address(addr))
                goto out;
+       if (is_bpf_image_address(addr))
+               goto out;
        ret = 0;
 out:
        if (no_rcu)