diff options
Diffstat (limited to 'arch/x86/kernel/signal.c')
-rw-r--r-- | arch/x86/kernel/signal.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 4fd173cd8e57..40a24932a8a1 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c | |||
@@ -601,10 +601,7 @@ long sys_rt_sigreturn(struct pt_regs *regs) | |||
601 | goto badframe; | 601 | goto badframe; |
602 | 602 | ||
603 | sigdelsetmask(&set, ~_BLOCKABLE); | 603 | sigdelsetmask(&set, ~_BLOCKABLE); |
604 | spin_lock_irq(¤t->sighand->siglock); | 604 | set_current_blocked(&set); |
605 | current->blocked = set; | ||
606 | recalc_sigpending(); | ||
607 | spin_unlock_irq(¤t->sighand->siglock); | ||
608 | 605 | ||
609 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax)) | 606 | if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax)) |
610 | goto badframe; | 607 | goto badframe; |
@@ -682,6 +679,7 @@ static int | |||
682 | handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, | 679 | handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, |
683 | sigset_t *oldset, struct pt_regs *regs) | 680 | sigset_t *oldset, struct pt_regs *regs) |
684 | { | 681 | { |
682 | sigset_t blocked; | ||
685 | int ret; | 683 | int ret; |
686 | 684 | ||
687 | /* Are we from a system call? */ | 685 | /* Are we from a system call? */ |
@@ -741,12 +739,10 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, | |||
741 | */ | 739 | */ |
742 | regs->flags &= ~X86_EFLAGS_TF; | 740 | regs->flags &= ~X86_EFLAGS_TF; |
743 | 741 | ||
744 | spin_lock_irq(¤t->sighand->siglock); | 742 | sigorsets(&blocked, ¤t->blocked, &ka->sa.sa_mask); |
745 | sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); | ||
746 | if (!(ka->sa.sa_flags & SA_NODEFER)) | 743 | if (!(ka->sa.sa_flags & SA_NODEFER)) |
747 | sigaddset(¤t->blocked, sig); | 744 | sigaddset(&blocked, sig); |
748 | recalc_sigpending(); | 745 | set_current_blocked(&blocked); |
749 | spin_unlock_irq(¤t->sighand->siglock); | ||
750 | 746 | ||
751 | tracehook_signal_handler(sig, info, ka, regs, | 747 | tracehook_signal_handler(sig, info, ka, regs, |
752 | test_thread_flag(TIF_SINGLESTEP)); | 748 | test_thread_flag(TIF_SINGLESTEP)); |