|
@@ -55,10 +55,21 @@ static int sig_handler_ignored(void __user *handler, int sig)
|
|
|
(handler == SIG_DFL && sig_kernel_ignore(sig));
|
|
|
}
|
|
|
|
|
|
-static int sig_ignored(struct task_struct *t, int sig)
|
|
|
+static int sig_task_ignored(struct task_struct *t, int sig)
|
|
|
{
|
|
|
void __user *handler;
|
|
|
|
|
|
+ handler = sig_handler(t, sig);
|
|
|
+
|
|
|
+ if (unlikely(t->signal->flags & SIGNAL_UNKILLABLE) &&
|
|
|
+ handler == SIG_DFL)
|
|
|
+ return 1;
|
|
|
+
|
|
|
+ return sig_handler_ignored(handler, sig);
|
|
|
+}
|
|
|
+
|
|
|
+static int sig_ignored(struct task_struct *t, int sig)
|
|
|
+{
|
|
|
/*
|
|
|
* Blocked signals are never ignored, since the
|
|
|
* signal handler may change by the time it is
|
|
@@ -67,8 +78,7 @@ static int sig_ignored(struct task_struct *t, int sig)
|
|
|
if (sigismember(&t->blocked, sig) || sigismember(&t->real_blocked, sig))
|
|
|
return 0;
|
|
|
|
|
|
- handler = sig_handler(t, sig);
|
|
|
- if (!sig_handler_ignored(handler, sig))
|
|
|
+ if (!sig_task_ignored(t, sig))
|
|
|
return 0;
|
|
|
|
|
|
/*
|