|
@@ -3648,25 +3648,23 @@ SYSCALL_DEFINE4(rt_sigaction, int, sig,
|
|
|
size_t, sigsetsize)
|
|
|
{
|
|
|
struct k_sigaction new_sa, old_sa;
|
|
|
- int ret = -EINVAL;
|
|
|
+ int ret;
|
|
|
|
|
|
/* XXX: Don't preclude handling different sized sigset_t's. */
|
|
|
if (sigsetsize != sizeof(sigset_t))
|
|
|
- goto out;
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
- if (act) {
|
|
|
- if (copy_from_user(&new_sa.sa, act, sizeof(new_sa.sa)))
|
|
|
- return -EFAULT;
|
|
|
- }
|
|
|
+ if (act && copy_from_user(&new_sa.sa, act, sizeof(new_sa.sa)))
|
|
|
+ return -EFAULT;
|
|
|
|
|
|
ret = do_sigaction(sig, act ? &new_sa : NULL, oact ? &old_sa : NULL);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
- if (!ret && oact) {
|
|
|
- if (copy_to_user(oact, &old_sa.sa, sizeof(old_sa.sa)))
|
|
|
- return -EFAULT;
|
|
|
- }
|
|
|
-out:
|
|
|
- return ret;
|
|
|
+ if (oact && copy_to_user(oact, &old_sa.sa, sizeof(old_sa.sa)))
|
|
|
+ return -EFAULT;
|
|
|
+
|
|
|
+ return 0;
|
|
|
}
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
COMPAT_SYSCALL_DEFINE4(rt_sigaction, int, sig,
|