]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/blob - arch/um/kernel/signal.c
um: don't restore current->blocked on error
[mirror_ubuntu-bionic-kernel.git] / arch / um / kernel / signal.c
1 /*
2 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
3 * Licensed under the GPL
4 */
5
6 #include <linux/module.h>
7 #include <linux/ptrace.h>
8 #include <linux/sched.h>
9 #include <asm/siginfo.h>
10 #include <asm/signal.h>
11 #include <asm/unistd.h>
12 #include "frame_kern.h"
13 #include "kern_util.h"
14
15 EXPORT_SYMBOL(block_signals);
16 EXPORT_SYMBOL(unblock_signals);
17
18 #define _S(nr) (1<<((nr)-1))
19
20 #define _BLOCKABLE (~(_S(SIGKILL) | _S(SIGSTOP)))
21
22 /*
23 * OK, we're invoking a handler
24 */
25 static int handle_signal(struct pt_regs *regs, unsigned long signr,
26 struct k_sigaction *ka, siginfo_t *info,
27 sigset_t *oldset)
28 {
29 unsigned long sp;
30 int err;
31
32 /* Always make any pending restarted system calls return -EINTR */
33 current_thread_info()->restart_block.fn = do_no_restart_syscall;
34
35 /* Did we come from a system call? */
36 if (PT_REGS_SYSCALL_NR(regs) >= 0) {
37 /* If so, check system call restarting.. */
38 switch (PT_REGS_SYSCALL_RET(regs)) {
39 case -ERESTART_RESTARTBLOCK:
40 case -ERESTARTNOHAND:
41 PT_REGS_SYSCALL_RET(regs) = -EINTR;
42 break;
43
44 case -ERESTARTSYS:
45 if (!(ka->sa.sa_flags & SA_RESTART)) {
46 PT_REGS_SYSCALL_RET(regs) = -EINTR;
47 break;
48 }
49 /* fallthrough */
50 case -ERESTARTNOINTR:
51 PT_REGS_RESTART_SYSCALL(regs);
52 PT_REGS_ORIG_SYSCALL(regs) = PT_REGS_SYSCALL_NR(regs);
53 break;
54 }
55 }
56
57 sp = PT_REGS_SP(regs);
58 if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0))
59 sp = current->sas_ss_sp + current->sas_ss_size;
60
61 #ifdef CONFIG_ARCH_HAS_SC_SIGNALS
62 if (!(ka->sa.sa_flags & SA_SIGINFO))
63 err = setup_signal_stack_sc(sp, signr, ka, regs, oldset);
64 else
65 #endif
66 err = setup_signal_stack_si(sp, signr, ka, regs, info, oldset);
67
68 if (err)
69 force_sigsegv(signr, current);
70 else {
71 spin_lock_irq(&current->sighand->siglock);
72 sigorsets(&current->blocked, &current->blocked,
73 &ka->sa.sa_mask);
74 if (!(ka->sa.sa_flags & SA_NODEFER))
75 sigaddset(&current->blocked, signr);
76 recalc_sigpending();
77 spin_unlock_irq(&current->sighand->siglock);
78 }
79
80 return err;
81 }
82
83 static int kern_do_signal(struct pt_regs *regs)
84 {
85 struct k_sigaction ka_copy;
86 siginfo_t info;
87 sigset_t *oldset;
88 int sig, handled_sig = 0;
89
90 if (test_thread_flag(TIF_RESTORE_SIGMASK))
91 oldset = &current->saved_sigmask;
92 else
93 oldset = &current->blocked;
94
95 while ((sig = get_signal_to_deliver(&info, &ka_copy, regs, NULL)) > 0) {
96 handled_sig = 1;
97 /* Whee! Actually deliver the signal. */
98 if (!handle_signal(regs, sig, &ka_copy, &info, oldset)) {
99 /*
100 * a signal was successfully delivered; the saved
101 * sigmask will have been stored in the signal frame,
102 * and will be restored by sigreturn, so we can simply
103 * clear the TIF_RESTORE_SIGMASK flag
104 */
105 if (test_thread_flag(TIF_RESTORE_SIGMASK))
106 clear_thread_flag(TIF_RESTORE_SIGMASK);
107 break;
108 }
109 }
110
111 /* Did we come from a system call? */
112 if (!handled_sig && (PT_REGS_SYSCALL_NR(regs) >= 0)) {
113 /* Restart the system call - no handlers present */
114 switch (PT_REGS_SYSCALL_RET(regs)) {
115 case -ERESTARTNOHAND:
116 case -ERESTARTSYS:
117 case -ERESTARTNOINTR:
118 PT_REGS_ORIG_SYSCALL(regs) = PT_REGS_SYSCALL_NR(regs);
119 PT_REGS_RESTART_SYSCALL(regs);
120 break;
121 case -ERESTART_RESTARTBLOCK:
122 PT_REGS_ORIG_SYSCALL(regs) = __NR_restart_syscall;
123 PT_REGS_RESTART_SYSCALL(regs);
124 break;
125 }
126 }
127
128 /*
129 * This closes a way to execute a system call on the host. If
130 * you set a breakpoint on a system call instruction and singlestep
131 * from it, the tracing thread used to PTRACE_SINGLESTEP the process
132 * rather than PTRACE_SYSCALL it, allowing the system call to execute
133 * on the host. The tracing thread will check this flag and
134 * PTRACE_SYSCALL if necessary.
135 */
136 if (current->ptrace & PT_DTRACE)
137 current->thread.singlestep_syscall =
138 is_syscall(PT_REGS_IP(&current->thread.regs));
139
140 /*
141 * if there's no signal to deliver, we just put the saved sigmask
142 * back
143 */
144 if (!handled_sig && test_thread_flag(TIF_RESTORE_SIGMASK)) {
145 clear_thread_flag(TIF_RESTORE_SIGMASK);
146 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
147 }
148 return handled_sig;
149 }
150
151 int do_signal(void)
152 {
153 return kern_do_signal(&current->thread.regs);
154 }
155
156 /*
157 * Atomically swap in the new signal mask, and wait for a signal.
158 */
159 long sys_sigsuspend(int history0, int history1, old_sigset_t mask)
160 {
161 mask &= _BLOCKABLE;
162 spin_lock_irq(&current->sighand->siglock);
163 current->saved_sigmask = current->blocked;
164 siginitset(&current->blocked, mask);
165 recalc_sigpending();
166 spin_unlock_irq(&current->sighand->siglock);
167
168 current->state = TASK_INTERRUPTIBLE;
169 schedule();
170 set_thread_flag(TIF_RESTORE_SIGMASK);
171 return -ERESTARTNOHAND;
172 }
173
174 long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)
175 {
176 return do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs));
177 }