Skip to content

Commit

Permalink
x86: signal: put give_sigsegv of setup frames together
Browse files Browse the repository at this point in the history 
When setup frame fails, force_sigsegv is called and returns -EFAULT.
There is similar code in ia32_setup_frame(), ia32_setup_rt_frame(),
__setup_frame() and __setup_rt_frame().

Make them identical.

No change in functionality intended.

Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Hiroshi Shimamoto authored and Ingo Molnar committed Sep 14, 2008
1 parent 764e8d1 commit 3d0aedd
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 42 deletions.
26 changes: 9 additions & 17 deletions arch/x86/ia32/ia32_signal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,21 +444,21 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);

if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv;
return -EFAULT;

err |= __put_user(sig, &frame->sig);
if (err)
goto give_sigsegv;
return -EFAULT;

err |= ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]);
if (err)
goto give_sigsegv;
return -EFAULT;

if (_COMPAT_NSIG_WORDS > 1) {
err |= __copy_to_user(frame->extramask, &set->sig[1],
sizeof(frame->extramask));
if (err)
goto give_sigsegv;
return -EFAULT;
}

if (ka->sa.sa_flags & SA_RESTORER) {
Expand All @@ -479,7 +479,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
*/
err |= __copy_to_user(frame->retcode, &code, 8);
if (err)
goto give_sigsegv;
return -EFAULT;

/* Set up registers for signal handler */
regs->sp = (unsigned long) frame;
Expand All @@ -502,10 +502,6 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
#endif

return 0;

give_sigsegv:
force_sigsegv(sig, current);
return -EFAULT;
}

int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
Expand Down Expand Up @@ -533,14 +529,14 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);

if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv;
return -EFAULT;

err |= __put_user(sig, &frame->sig);
err |= __put_user(ptr_to_compat(&frame->info), &frame->pinfo);
err |= __put_user(ptr_to_compat(&frame->uc), &frame->puc);
err |= copy_siginfo_to_user32(&frame->info, info);
if (err)
goto give_sigsegv;
return -EFAULT;

/* Create the ucontext. */
if (cpu_has_xsave)
Expand All @@ -556,7 +552,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs, set->sig[0]);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
if (err)
goto give_sigsegv;
return -EFAULT;

if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
Expand All @@ -571,7 +567,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
*/
err |= __copy_to_user(frame->retcode, &code, 8);
if (err)
goto give_sigsegv;
return -EFAULT;

/* Set up registers for signal handler */
regs->sp = (unsigned long) frame;
Expand Down Expand Up @@ -599,8 +595,4 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
#endif

return 0;

give_sigsegv:
force_sigsegv(sig, current);
return -EFAULT;
}
31 changes: 14 additions & 17 deletions arch/x86/kernel/signal_32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,21 +349,21 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);

if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv;
return -EFAULT;

err = __put_user(sig, &frame->sig);
if (err)
goto give_sigsegv;
return -EFAULT;

err = setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]);
if (err)
goto give_sigsegv;
return -EFAULT;

if (_NSIG_WORDS > 1) {
err = __copy_to_user(&frame->extramask, &set->sig[1],
sizeof(frame->extramask));
if (err)
goto give_sigsegv;
return -EFAULT;
}

if (current->mm->context.vdso)
Expand All @@ -388,7 +388,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
err |= __put_user(0x80cd, (short __user *)(frame->retcode+6));

if (err)
goto give_sigsegv;
return -EFAULT;

/* Set up registers for signal handler */
regs->sp = (unsigned long)frame;
Expand All @@ -403,10 +403,6 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
regs->cs = __USER_CS;

return 0;

give_sigsegv:
force_sigsegv(sig, current);
return -EFAULT;
}

static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
Expand All @@ -420,14 +416,14 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);

if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv;
return -EFAULT;

err |= __put_user(sig, &frame->sig);
err |= __put_user(&frame->info, &frame->pinfo);
err |= __put_user(&frame->uc, &frame->puc);
err |= copy_siginfo_to_user(&frame->info, info);
if (err)
goto give_sigsegv;
return -EFAULT;

/* Create the ucontext. */
if (cpu_has_xsave)
Expand All @@ -443,7 +439,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs, set->sig[0]);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
if (err)
goto give_sigsegv;
return -EFAULT;

/* Set up to return from userspace. */
restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
Expand All @@ -463,7 +459,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(0x80cd, (short __user *)(frame->retcode+5));

if (err)
goto give_sigsegv;
return -EFAULT;

/* Set up registers for signal handler */
regs->sp = (unsigned long)frame;
Expand All @@ -478,10 +474,6 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs->cs = __USER_CS;

return 0;

give_sigsegv:
force_sigsegv(sig, current);
return -EFAULT;
}

/*
Expand All @@ -506,6 +498,11 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
else
ret = __setup_frame(usig, ka, set, regs);

if (ret) {
force_sigsegv(sig, current);
return -EFAULT;
}

return ret;
}

Expand Down
17 changes: 9 additions & 8 deletions arch/x86/kernel/signal_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,12 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;

if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv;
return -EFAULT;

if (ka->sa.sa_flags & SA_SIGINFO) {
err |= copy_siginfo_to_user(&frame->info, info);
if (err)
goto give_sigsegv;
return -EFAULT;
}

/* Create the ucontext. */
Expand Down Expand Up @@ -248,11 +248,11 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(ka->sa.sa_restorer, &frame->pretcode);
} else {
/* could use a vstub here */
goto give_sigsegv;
return -EFAULT;
}

if (err)
goto give_sigsegv;
return -EFAULT;

/* Set up registers for signal handler */
regs->di = sig;
Expand All @@ -272,10 +272,6 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
regs->cs = __USER_CS;

return 0;

give_sigsegv:
force_sigsegv(sig, current);
return -EFAULT;
}

/*
Expand All @@ -297,6 +293,11 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
#endif
ret = __setup_rt_frame(sig, ka, info, set, regs);

if (ret) {
force_sigsegv(sig, current);
return -EFAULT;
}

return ret;
}

Expand Down

0 comments on commit 3d0aedd

Please sign in to comment.