X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=kernel%2Fsignal.c;h=60d80ab2601c544ac03460cdb6888dd8c699dd4f;hb=6ac1ef482d7ae0c690f1640bf6eb818ff9a2d91e;hp=17afcaf582d07a5bb8abf843a44d1f593403e473;hpb=a385ec4f11bdcf81af094c03e2444ee9b7fad2e5;p=firefly-linux-kernel-4.4.55.git

diff --git a/kernel/signal.c b/kernel/signal.c
index 17afcaf582d0..60d80ab2601c 100644
--- 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.