2 files changed, 10 insertions, 12 deletions
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index d05d65ac9694..7358cdb8441f 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -637,12 +637,11 @@ handle_signal32(unsigned long sig, struct k_sigaction *ka,
        else
                setup_frame32(sig, ka, oldset, regs);
-        if (!(ka->sa.sa_flags & SA_NODEFER)) {
+        spin_lock_irq(&current->sighand->siglock);
-                spin_lock_irq(&current->sighand->siglock);
+        sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-                sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+        if (!(ka->sa.sa_flags & SA_NODEFER))
                sigaddset(&current->blocked,sig);
-                recalc_sigpending();
+        recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
+        spin_unlock_irq(&current->sighand->siglock);
-        }
 }
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c
index 610c1d03e975..6a3f5b7473a9 100644
--- a/arch/s390/kernel/signal.c
+++ b/arch/s390/kernel/signal.c
@@ -429,13 +429,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
        else
                setup_frame(sig, ka, oldset, regs);
-        if (!(ka->sa.sa_flags & SA_NODEFER)) {
+        spin_lock_irq(&current->sighand->siglock);
-                spin_lock_irq(&current->sighand->siglock);
+        sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
-                sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+        if (!(ka->sa.sa_flags & SA_NODEFER))
                sigaddset(&current->blocked,sig);
-                recalc_sigpending();
+        recalc_sigpending();
-                spin_unlock_irq(&current->sighand->siglock);
+        spin_unlock_irq(&current->sighand->siglock);
-        }
 }
 /*

diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index d05d65ac9694..7358cdb8441f 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c
@@ -637,12 +637,11 @@ handle_signal32(unsigned long sig, struct k_sigaction *ka,
637	else	637	else
638	setup_frame32(sig, ka, oldset, regs);	638	setup_frame32(sig, ka, oldset, regs);
639		639
640	if (!(ka->sa.sa_flags & SA_NODEFER)) {	640	spin_lock_irq(&current->sighand->siglock);
641	spin_lock_irq(&current->sighand->siglock);	641	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
642	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);	642	if (!(ka->sa.sa_flags & SA_NODEFER))
643	sigaddset(&current->blocked,sig);	643	sigaddset(&current->blocked,sig);
644	recalc_sigpending();	644	recalc_sigpending();
645	spin_unlock_irq(&current->sighand->siglock);	645	spin_unlock_irq(&current->sighand->siglock);
646	}
647	}	646	}
648		647


diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index 610c1d03e975..6a3f5b7473a9 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c
@@ -429,13 +429,12 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
429	else	429	else
430	setup_frame(sig, ka, oldset, regs);	430	setup_frame(sig, ka, oldset, regs);
431		431
432	if (!(ka->sa.sa_flags & SA_NODEFER)) {	432	spin_lock_irq(&current->sighand->siglock);
433	spin_lock_irq(&current->sighand->siglock);	433	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
434	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);	434	if (!(ka->sa.sa_flags & SA_NODEFER))
435	sigaddset(&current->blocked,sig);	435	sigaddset(&current->blocked,sig);
436	recalc_sigpending();	436	recalc_sigpending();
437	spin_unlock_irq(&current->sighand->siglock);	437	spin_unlock_irq(&current->sighand->siglock);
438	}
439	}	438	}
440		439
441	/*	440	/*