|
@@ -238,22 +238,21 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
|
|
|
*/
|
|
|
ret |= !valid_user_regs(regs);
|
|
|
|
|
|
+ if (ret != 0) {
|
|
|
+ force_sigsegv(sig, current);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
- * Block the signal if we were unsuccessful.
|
|
|
+ * Block the signal if we were successful.
|
|
|
*/
|
|
|
- if (ret != 0 || !(ka->sa.sa_flags & SA_NODEFER)) {
|
|
|
- spin_lock_irq(¤t->sighand->siglock);
|
|
|
- sigorsets(¤t->blocked, ¤t->blocked,
|
|
|
- &ka->sa.sa_mask);
|
|
|
+ spin_lock_irq(¤t->sighand->siglock);
|
|
|
+ sigorsets(¤t->blocked, ¤t->blocked,
|
|
|
+ &ka->sa.sa_mask);
|
|
|
+ if (!(ka->sa.sa_flags & SA_NODEFER))
|
|
|
sigaddset(¤t->blocked, sig);
|
|
|
- recalc_sigpending();
|
|
|
- spin_unlock_irq(¤t->sighand->siglock);
|
|
|
- }
|
|
|
-
|
|
|
- if (ret == 0)
|
|
|
- return;
|
|
|
-
|
|
|
- force_sigsegv(sig, current);
|
|
|
+ recalc_sigpending();
|
|
|
+ spin_unlock_irq(¤t->sighand->siglock);
|
|
|
}
|
|
|
|
|
|
/*
|