Commit b87df659 authored by Al Viro's avatar Al Viro

x86: unsafe_put-style macro for sigmask

regularizes things a bit
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 791612e9
...@@ -203,6 +203,11 @@ do { \ ...@@ -203,6 +203,11 @@ do { \
goto label; \ goto label; \
} while(0); } while(0);
#define unsafe_put_sigmask(set, frame, label) \
unsafe_put_user(*(__u64 *)(set), \
(__u64 __user *)&(frame)->uc.uc_sigmask, \
label)
/* /*
* Set up a signal frame. * Set up a signal frame.
*/ */
...@@ -392,8 +397,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, ...@@ -392,8 +397,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
*/ */
unsafe_put_user(*((u64 *)&rt_retcode), (u64 *)frame->retcode, Efault); unsafe_put_user(*((u64 *)&rt_retcode), (u64 *)frame->retcode, Efault);
unsafe_put_sigcontext(&frame->uc.uc_mcontext, fp, regs, set, Efault); unsafe_put_sigcontext(&frame->uc.uc_mcontext, fp, regs, set, Efault);
unsafe_put_user(*(__u64 *)set, unsafe_put_sigmask(set, frame, Efault);
(__u64 __user *)&frame->uc.uc_sigmask, Efault);
user_access_end(); user_access_end();
if (copy_siginfo_to_user(&frame->info, &ksig->info)) if (copy_siginfo_to_user(&frame->info, &ksig->info))
...@@ -458,7 +462,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, ...@@ -458,7 +462,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
already in userspace. */ already in userspace. */
unsafe_put_user(ksig->ka.sa.sa_restorer, &frame->pretcode, Efault); unsafe_put_user(ksig->ka.sa.sa_restorer, &frame->pretcode, Efault);
unsafe_put_sigcontext(&frame->uc.uc_mcontext, fp, regs, set, Efault); unsafe_put_sigcontext(&frame->uc.uc_mcontext, fp, regs, set, Efault);
unsafe_put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0], Efault); unsafe_put_sigmask(set, frame, Efault);
user_access_end(); user_access_end();
if (ksig->ka.sa.sa_flags & SA_SIGINFO) { if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
...@@ -537,7 +541,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig, ...@@ -537,7 +541,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig,
restorer = ksig->ka.sa.sa_restorer; restorer = ksig->ka.sa.sa_restorer;
unsafe_put_user(restorer, (unsigned long __user *)&frame->pretcode, Efault); unsafe_put_user(restorer, (unsigned long __user *)&frame->pretcode, Efault);
unsafe_put_sigcontext(&frame->uc.uc_mcontext, fp, regs, set, Efault); unsafe_put_sigcontext(&frame->uc.uc_mcontext, fp, regs, set, Efault);
unsafe_put_user(*(__u64 *)set, (__u64 __user *)&frame->uc.uc_sigmask, Efault); unsafe_put_sigmask(set, frame, Efault);
user_access_end(); user_access_end();
if (ksig->ka.sa.sa_flags & SA_SIGINFO) { if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
......
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