.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-or-later |
---|
1 | 2 | /* |
---|
2 | 3 | * OpenRISC signal.c |
---|
3 | 4 | * |
---|
.. | .. |
---|
8 | 9 | * Modifications for the OpenRISC architecture: |
---|
9 | 10 | * Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com> |
---|
10 | 11 | * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se> |
---|
11 | | - * |
---|
12 | | - * This program is free software; you can redistribute it and/or |
---|
13 | | - * modify it under the terms of the GNU General Public License |
---|
14 | | - * as published by the Free Software Foundation; either version |
---|
15 | | - * 2 of the License, or (at your option) any later version. |
---|
16 | 12 | */ |
---|
17 | 13 | |
---|
18 | 14 | #include <linux/sched.h> |
---|
.. | .. |
---|
50 | 46 | |
---|
51 | 47 | /* |
---|
52 | 48 | * Restore the regs from &sc->regs. |
---|
53 | | - * (sc is already checked for VERIFY_READ since the sigframe was |
---|
| 49 | + * (sc is already checked since the sigframe was |
---|
54 | 50 | * checked in sys_sigreturn previously) |
---|
55 | 51 | */ |
---|
56 | 52 | err |= __copy_from_user(regs, sc->regs.gpr, 32 * sizeof(unsigned long)); |
---|
.. | .. |
---|
72 | 68 | |
---|
73 | 69 | asmlinkage long _sys_rt_sigreturn(struct pt_regs *regs) |
---|
74 | 70 | { |
---|
75 | | - struct rt_sigframe *frame = (struct rt_sigframe __user *)regs->sp; |
---|
| 71 | + struct rt_sigframe __user *frame = (struct rt_sigframe __user *)regs->sp; |
---|
76 | 72 | sigset_t set; |
---|
77 | 73 | |
---|
78 | 74 | /* |
---|
.. | .. |
---|
80 | 76 | * then frame should be dword aligned here. If it's |
---|
81 | 77 | * not, then the user is trying to mess with us. |
---|
82 | 78 | */ |
---|
83 | | - if (((long)frame) & 3) |
---|
| 79 | + if (((unsigned long)frame) & 3) |
---|
84 | 80 | goto badframe; |
---|
85 | 81 | |
---|
86 | | - if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) |
---|
| 82 | + if (!access_ok(frame, sizeof(*frame))) |
---|
87 | 83 | goto badframe; |
---|
88 | 84 | if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) |
---|
89 | 85 | goto badframe; |
---|
.. | .. |
---|
99 | 95 | return regs->gpr[11]; |
---|
100 | 96 | |
---|
101 | 97 | badframe: |
---|
102 | | - force_sig(SIGSEGV, current); |
---|
| 98 | + force_sig(SIGSEGV); |
---|
103 | 99 | return 0; |
---|
104 | 100 | } |
---|
105 | 101 | |
---|
.. | .. |
---|
155 | 151 | static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, |
---|
156 | 152 | struct pt_regs *regs) |
---|
157 | 153 | { |
---|
158 | | - struct rt_sigframe *frame; |
---|
| 154 | + struct rt_sigframe __user *frame; |
---|
159 | 155 | unsigned long return_ip; |
---|
160 | 156 | int err = 0; |
---|
161 | 157 | |
---|
162 | 158 | frame = get_sigframe(ksig, regs, sizeof(*frame)); |
---|
163 | 159 | |
---|
164 | | - if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) |
---|
| 160 | + if (!access_ok(frame, sizeof(*frame))) |
---|
165 | 161 | return -EFAULT; |
---|
166 | 162 | |
---|
167 | 163 | /* Create siginfo. */ |
---|
.. | .. |
---|
185 | 181 | l.ori r11,r0,__NR_sigreturn |
---|
186 | 182 | l.sys 1 |
---|
187 | 183 | */ |
---|
188 | | - err |= __put_user(0xa960, (short *)(frame->retcode + 0)); |
---|
189 | | - err |= __put_user(__NR_rt_sigreturn, (short *)(frame->retcode + 2)); |
---|
190 | | - err |= __put_user(0x20000001, (unsigned long *)(frame->retcode + 4)); |
---|
191 | | - err |= __put_user(0x15000000, (unsigned long *)(frame->retcode + 8)); |
---|
| 184 | + err |= __put_user(0xa960, (short __user *)(frame->retcode + 0)); |
---|
| 185 | + err |= __put_user(__NR_rt_sigreturn, (short __user *)(frame->retcode + 2)); |
---|
| 186 | + err |= __put_user(0x20000001, (unsigned long __user *)(frame->retcode + 4)); |
---|
| 187 | + err |= __put_user(0x15000000, (unsigned long __user *)(frame->retcode + 8)); |
---|
192 | 188 | |
---|
193 | 189 | if (err) |
---|
194 | 190 | return -EFAULT; |
---|
.. | .. |
---|
248 | 244 | switch (retval) { |
---|
249 | 245 | case -ERESTART_RESTARTBLOCK: |
---|
250 | 246 | restart = -2; |
---|
251 | | - /* Fall through */ |
---|
| 247 | + fallthrough; |
---|
252 | 248 | case -ERESTARTNOHAND: |
---|
253 | 249 | case -ERESTARTSYS: |
---|
254 | 250 | case -ERESTARTNOINTR: |
---|
.. | .. |
---|
303 | 299 | if (unlikely(!user_mode(regs))) |
---|
304 | 300 | return 0; |
---|
305 | 301 | local_irq_enable(); |
---|
306 | | - if (thread_flags & _TIF_SIGPENDING) { |
---|
| 302 | + if (thread_flags & (_TIF_SIGPENDING|_TIF_NOTIFY_SIGNAL)) { |
---|
307 | 303 | int restart = do_signal(regs, syscall); |
---|
308 | 304 | if (unlikely(restart)) { |
---|
309 | 305 | /* |
---|
.. | .. |
---|
315 | 311 | } |
---|
316 | 312 | syscall = 0; |
---|
317 | 313 | } else { |
---|
318 | | - clear_thread_flag(TIF_NOTIFY_RESUME); |
---|
319 | 314 | tracehook_notify_resume(regs); |
---|
320 | 315 | } |
---|
321 | 316 | } |
---|