Skip to content

Commit

Permalink
x86: switch sigframe sigset handling to explict __get_user()/__put_us…
Browse files Browse the repository at this point in the history 
…er()

... and consolidate the definition of sigframe_ia32->extramask - it's
always a 1-element array of 32bit unsigned.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Mar 18, 2020
1 parent a481444 commit 71c3313
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 28 deletions.
16 changes: 5 additions & 11 deletions arch/x86/ia32/ia32_signal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,7 @@ COMPAT_SYSCALL_DEFINE0(sigreturn)
if (!access_ok(frame, sizeof(*frame)))
goto badframe;
if (__get_user(set.sig[0], &frame->sc.oldmask)
|| (_COMPAT_NSIG_WORDS > 1
&& __copy_from_user((((char *) &set.sig) + 4),
&frame->extramask,
sizeof(frame->extramask))))
|| __get_user(((__u32 *)&set)[1], &frame->extramask[0]))
goto badframe;

set_current_blocked(&set);
Expand All @@ -153,7 +150,7 @@ COMPAT_SYSCALL_DEFINE0(rt_sigreturn)

if (!access_ok(frame, sizeof(*frame)))
goto badframe;
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
if (__get_user(set.sig[0], (__u64 __user *)&frame->uc.uc_sigmask))
goto badframe;

set_current_blocked(&set);
Expand Down Expand Up @@ -277,11 +274,8 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
if (ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))
return -EFAULT;

if (_COMPAT_NSIG_WORDS > 1) {
if (__copy_to_user(frame->extramask, &set->sig[1],
sizeof(frame->extramask)))
return -EFAULT;
}
if (__put_user(set->sig[1], &frame->extramask[0]))
return -EFAULT;

if (ksig->ka.sa.sa_flags & SA_RESTORER) {
restorer = ksig->ka.sa.sa_restorer;
Expand Down Expand Up @@ -381,7 +375,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
err |= __copy_siginfo_to_user32(&frame->info, &ksig->info, false);
err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
regs, set->sig[0]);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
err |= __put_user(*(__u64 *)set, (__u64 __user *)&frame->uc.uc_sigmask);

if (err)
return -EFAULT;
Expand Down
6 changes: 1 addition & 5 deletions arch/x86/include/asm/sigframe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ struct sigframe_ia32 {
* legacy application accessing/modifying it.
*/
struct _fpstate_32 fpstate_unused;
#ifdef CONFIG_IA32_EMULATION
unsigned int extramask[_COMPAT_NSIG_WORDS-1];
#else /* !CONFIG_IA32_EMULATION */
unsigned long extramask[_NSIG_WORDS-1];
#endif /* CONFIG_IA32_EMULATION */
unsigned int extramask[1];
char retcode[8];
/* fp state follows here */
};
Expand Down
20 changes: 8 additions & 12 deletions arch/x86/kernel/signal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,8 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
if (setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))
return -EFAULT;

if (_NSIG_WORDS > 1) {
if (__copy_to_user(&frame->extramask, &set->sig[1],
sizeof(frame->extramask)))
return -EFAULT;
}
if (__put_user(set->sig[1], &frame->extramask[0]))
return -EFAULT;

if (current->mm->context.vdso)
restorer = current->mm->context.vdso +
Expand Down Expand Up @@ -489,7 +486,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
} put_user_catch(err);

err |= setup_sigcontext(&frame->uc.uc_mcontext, fp, regs, set->sig[0]);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
err |= __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);

if (err)
return -EFAULT;
Expand Down Expand Up @@ -575,7 +572,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig,

err |= setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
regs, set->sig[0]);
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
err |= __put_user(*(__u64 *)set, (__u64 __user *)&frame->uc.uc_sigmask);

if (err)
return -EFAULT;
Expand Down Expand Up @@ -613,9 +610,8 @@ SYSCALL_DEFINE0(sigreturn)

if (!access_ok(frame, sizeof(*frame)))
goto badframe;
if (__get_user(set.sig[0], &frame->sc.oldmask) || (_NSIG_WORDS > 1
&& __copy_from_user(&set.sig[1], &frame->extramask,
sizeof(frame->extramask))))
if (__get_user(set.sig[0], &frame->sc.oldmask) ||
__get_user(set.sig[1], &frame->extramask[0]))
goto badframe;

set_current_blocked(&set);
Expand Down Expand Up @@ -645,7 +641,7 @@ SYSCALL_DEFINE0(rt_sigreturn)
frame = (struct rt_sigframe __user *)(regs->sp - sizeof(long));
if (!access_ok(frame, sizeof(*frame)))
goto badframe;
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
if (__get_user(*(__u64 *)&set, (__u64 __user *)&frame->uc.uc_sigmask))
goto badframe;
if (__get_user(uc_flags, &frame->uc.uc_flags))
goto badframe;
Expand Down Expand Up @@ -870,7 +866,7 @@ asmlinkage long sys32_x32_rt_sigreturn(void)

if (!access_ok(frame, sizeof(*frame)))
goto badframe;
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
if (__get_user(set.sig[0], (__u64 __user *)&frame->uc.uc_sigmask))
goto badframe;
if (__get_user(uc_flags, &frame->uc.uc_flags))
goto badframe;
Expand Down

0 comments on commit 71c3313

Please sign in to comment.