Skip to content

Commit 408bd9d

Browse files
seehearfeeltsbogend
authored andcommitted
MIPS: signal: Return immediately if call fails
When debug sigaltstack(), copy_siginfo_to_user() fails first in setup_rt_frame() if the alternate signal stack is too small, so it should return immediately if call fails, no need to call the following functions. Signed-off-by: Tiezhu Yang <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 0ebd37a commit 408bd9d

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

arch/mips/kernel/signal.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -754,23 +754,25 @@ static int setup_rt_frame(void *sig_return, struct ksignal *ksig,
754754
struct pt_regs *regs, sigset_t *set)
755755
{
756756
struct rt_sigframe __user *frame;
757-
int err = 0;
758757

759758
frame = get_sigframe(ksig, regs, sizeof(*frame));
760759
if (!access_ok(frame, sizeof (*frame)))
761760
return -EFAULT;
762761

763762
/* Create siginfo. */
764-
err |= copy_siginfo_to_user(&frame->rs_info, &ksig->info);
763+
if (copy_siginfo_to_user(&frame->rs_info, &ksig->info))
764+
return -EFAULT;
765765

766766
/* Create the ucontext. */
767-
err |= __put_user(0, &frame->rs_uc.uc_flags);
768-
err |= __put_user(NULL, &frame->rs_uc.uc_link);
769-
err |= __save_altstack(&frame->rs_uc.uc_stack, regs->regs[29]);
770-
err |= setup_sigcontext(regs, &frame->rs_uc.uc_mcontext);
771-
err |= __copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set));
772-
773-
if (err)
767+
if (__put_user(0, &frame->rs_uc.uc_flags))
768+
return -EFAULT;
769+
if (__put_user(NULL, &frame->rs_uc.uc_link))
770+
return -EFAULT;
771+
if (__save_altstack(&frame->rs_uc.uc_stack, regs->regs[29]))
772+
return -EFAULT;
773+
if (setup_sigcontext(regs, &frame->rs_uc.uc_mcontext))
774+
return -EFAULT;
775+
if (__copy_to_user(&frame->rs_uc.uc_sigmask, set, sizeof(*set)))
774776
return -EFAULT;
775777

776778
/*

0 commit comments

Comments
 (0)