diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-25 19:30:53 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 18:15:53 -0500 |
commit | eb2f256682e5af4b890d1f3cce4a4d4b62ffa655 (patch) | |
tree | dde04f6f419c6157938420de669830f5b789da94 /arch/cris/arch-v10 | |
parent | 86df89a0845a80aa765f3e5e0da43fdf9287029f (diff) |
cris: switch to generic old sigaction()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/cris/arch-v10')
-rw-r--r-- | arch/cris/arch-v10/kernel/signal.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index e53c1b455c35..090e9c64408b 100644 --- a/arch/cris/arch-v10/kernel/signal.c +++ b/arch/cris/arch-v10/kernel/signal.c | |||
@@ -41,37 +41,6 @@ | |||
41 | 41 | ||
42 | void do_signal(int canrestart, struct pt_regs *regs); | 42 | void do_signal(int canrestart, struct pt_regs *regs); |
43 | 43 | ||
44 | int sys_sigaction(int sig, const struct old_sigaction __user *act, | ||
45 | struct old_sigaction *oact) | ||
46 | { | ||
47 | struct k_sigaction new_ka, old_ka; | ||
48 | int ret; | ||
49 | |||
50 | if (act) { | ||
51 | old_sigset_t mask; | ||
52 | if (!access_ok(VERIFY_READ, act, sizeof(*act)) || | ||
53 | __get_user(new_ka.sa.sa_handler, &act->sa_handler) || | ||
54 | __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) || | ||
55 | __get_user(new_ka.sa.sa_flags, &act->sa_flags) || | ||
56 | __get_user(mask, &act->sa_mask)) | ||
57 | return -EFAULT; | ||
58 | siginitset(&new_ka.sa.sa_mask, mask); | ||
59 | } | ||
60 | |||
61 | ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL); | ||
62 | |||
63 | if (!ret && oact) { | ||
64 | if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) || | ||
65 | __put_user(old_ka.sa.sa_handler, &oact->sa_handler) || | ||
66 | __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) || | ||
67 | __put_user(old_ka.sa.sa_flags, &oact->sa_flags) || | ||
68 | __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask)) | ||
69 | return -EFAULT; | ||
70 | } | ||
71 | |||
72 | return ret; | ||
73 | } | ||
74 | |||
75 | /* | 44 | /* |
76 | * Do a signal return; undo the signal stack. | 45 | * Do a signal return; undo the signal stack. |
77 | */ | 46 | */ |