Merge branch 'perf/core' into perf/uprobes

[firefly-linux-kernel-4.4.55.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 17afcaf582d07a5bb8abf843a44d1f593403e473..60d80ab2601c544ac03460cdb6888dd8c699dd4f 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -29,6 +29,7 @@
 #include <linux/pid_namespace.h>
 #include <linux/nsproxy.h>
 #include <linux/user_namespace.h>
+#include <linux/uprobes.h>
 #define CREATE_TRACE_POINTS
 #include <trace/events/signal.h>
 
@@ -2202,6 +2203,9 @@ int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka,
        struct signal_struct *signal = current->signal;
        int signr;
 
+       if (unlikely(uprobe_deny_signal()))
+               return 0;
+
 relock:
        /*
         * We'll jump back here after any time we were stopped in TASK_STOPPED.