|
@@ -513,16 +513,7 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
|
|
{
|
|
{
|
|
int sig = 0;
|
|
int sig = 0;
|
|
|
|
|
|
- /* SIGKILL must have priority, otherwise it is quite easy
|
|
|
|
- * to create an unkillable process, sending sig < SIGKILL
|
|
|
|
- * to self */
|
|
|
|
- if (unlikely(sigismember(&pending->signal, SIGKILL))) {
|
|
|
|
- if (!sigismember(mask, SIGKILL))
|
|
|
|
- sig = SIGKILL;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (likely(!sig))
|
|
|
|
- sig = next_signal(pending, mask);
|
|
|
|
|
|
+ sig = next_signal(pending, mask);
|
|
if (sig) {
|
|
if (sig) {
|
|
if (current->notifier) {
|
|
if (current->notifier) {
|
|
if (sigismember(current->notifier_mask, sig)) {
|
|
if (sigismember(current->notifier_mask, sig)) {
|