Commit 2ba48e16 authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar

x86: signal: remove unneeded err handling

This patch eliminates unused or unneeded variable handling.
Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3d0aedd9
...@@ -446,18 +446,15 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, ...@@ -446,18 +446,15 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT; return -EFAULT;
err |= __put_user(sig, &frame->sig); if (__put_user(sig, &frame->sig))
if (err)
return -EFAULT; return -EFAULT;
err |= ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]); if (ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))
if (err)
return -EFAULT; return -EFAULT;
if (_COMPAT_NSIG_WORDS > 1) { if (_COMPAT_NSIG_WORDS > 1) {
err |= __copy_to_user(frame->extramask, &set->sig[1], if (__copy_to_user(frame->extramask, &set->sig[1],
sizeof(frame->extramask)); sizeof(frame->extramask)))
if (err)
return -EFAULT; return -EFAULT;
} }
......
...@@ -351,18 +351,15 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, ...@@ -351,18 +351,15 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
return -EFAULT; return -EFAULT;
err = __put_user(sig, &frame->sig); if (__put_user(sig, &frame->sig))
if (err)
return -EFAULT; return -EFAULT;
err = setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]); if (setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))
if (err)
return -EFAULT; return -EFAULT;
if (_NSIG_WORDS > 1) { if (_NSIG_WORDS > 1) {
err = __copy_to_user(&frame->extramask, &set->sig[1], if (__copy_to_user(&frame->extramask, &set->sig[1],
sizeof(frame->extramask)); sizeof(frame->extramask)))
if (err)
return -EFAULT; return -EFAULT;
} }
......
...@@ -210,7 +210,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, ...@@ -210,7 +210,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
(unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8; (unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;
if (save_i387_xstate(fp) < 0) if (save_i387_xstate(fp) < 0)
err |= -1; return -EFAULT;
} else } else
frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8; frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;
...@@ -218,8 +218,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, ...@@ -218,8 +218,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
return -EFAULT; return -EFAULT;
if (ka->sa.sa_flags & SA_SIGINFO) { if (ka->sa.sa_flags & SA_SIGINFO) {
err |= copy_siginfo_to_user(&frame->info, info); if (copy_siginfo_to_user(&frame->info, info))
if (err)
return -EFAULT; return -EFAULT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment