tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

x86: switch sigframe sigset handling to explict __get_user()/__put_user()

... 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>

Al Viro 71c3313a a4814443

+14 -28
+5 -11
arch/x86/ia32/ia32_signal.c
··· 126 126 if (!access_ok(frame, sizeof(*frame))) 127 127 goto badframe; 128 128 if (__get_user(set.sig[0], &frame->sc.oldmask) 129 - || (_COMPAT_NSIG_WORDS > 1 130 - && __copy_from_user((((char *) &set.sig) + 4), 131 - &frame->extramask, 132 - sizeof(frame->extramask)))) 129 + || __get_user(((__u32 *)&set)[1], &frame->extramask[0])) 133 130 goto badframe; 134 131 135 132 set_current_blocked(&set); ··· 150 153 151 154 if (!access_ok(frame, sizeof(*frame))) 152 155 goto badframe; 153 - if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) 156 + if (__get_user(set.sig[0], (__u64 __user *)&frame->uc.uc_sigmask)) 154 157 goto badframe; 155 158 156 159 set_current_blocked(&set); ··· 274 277 if (ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0])) 275 278 return -EFAULT; 276 279 277 - if (_COMPAT_NSIG_WORDS > 1) { 278 - if (__copy_to_user(frame->extramask, &set->sig[1], 279 - sizeof(frame->extramask))) 280 - return -EFAULT; 281 - } 280 + if (__put_user(set->sig[1], &frame->extramask[0])) 281 + return -EFAULT; 282 282 283 283 if (ksig->ka.sa.sa_flags & SA_RESTORER) { 284 284 restorer = ksig->ka.sa.sa_restorer; ··· 375 381 err |= __copy_siginfo_to_user32(&frame->info, &ksig->info, false); 376 382 err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, fpstate, 377 383 regs, set->sig[0]); 378 - err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); 384 + err |= __put_user(*(__u64 *)set, (__u64 __user *)&frame->uc.uc_sigmask); 379 385 380 386 if (err) 381 387 return -EFAULT;
+1 -5
arch/x86/include/asm/sigframe.h
··· 33 33 * legacy application accessing/modifying it. 34 34 */ 35 35 struct _fpstate_32 fpstate_unused; 36 - #ifdef CONFIG_IA32_EMULATION 37 - unsigned int extramask[_COMPAT_NSIG_WORDS-1]; 38 - #else /* !CONFIG_IA32_EMULATION */ 39 - unsigned long extramask[_NSIG_WORDS-1]; 40 - #endif /* CONFIG_IA32_EMULATION */ 36 + unsigned int extramask[1]; 41 37 char retcode[8]; 42 38 /* fp state follows here */ 43 39 };
+8 -12
arch/x86/kernel/signal.c
··· 326 326 if (setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0])) 327 327 return -EFAULT; 328 328 329 - if (_NSIG_WORDS > 1) { 330 - if (__copy_to_user(&frame->extramask, &set->sig[1], 331 - sizeof(frame->extramask))) 332 - return -EFAULT; 333 - } 329 + if (__put_user(set->sig[1], &frame->extramask[0])) 330 + return -EFAULT; 334 331 335 332 if (current->mm->context.vdso) 336 333 restorer = current->mm->context.vdso + ··· 486 489 } put_user_catch(err); 487 490 488 491 err |= setup_sigcontext(&frame->uc.uc_mcontext, fp, regs, set->sig[0]); 489 - err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); 492 + err |= __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]); 490 493 491 494 if (err) 492 495 return -EFAULT; ··· 572 575 573 576 err |= setup_sigcontext(&frame->uc.uc_mcontext, fpstate, 574 577 regs, set->sig[0]); 575 - err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); 578 + err |= __put_user(*(__u64 *)set, (__u64 __user *)&frame->uc.uc_sigmask); 576 579 577 580 if (err) 578 581 return -EFAULT; ··· 610 613 611 614 if (!access_ok(frame, sizeof(*frame))) 612 615 goto badframe; 613 - if (__get_user(set.sig[0], &frame->sc.oldmask) || (_NSIG_WORDS > 1 614 - && __copy_from_user(&set.sig[1], &frame->extramask, 615 - sizeof(frame->extramask)))) 616 + if (__get_user(set.sig[0], &frame->sc.oldmask) || 617 + __get_user(set.sig[1], &frame->extramask[0])) 616 618 goto badframe; 617 619 618 620 set_current_blocked(&set); ··· 641 645 frame = (struct rt_sigframe __user *)(regs->sp - sizeof(long)); 642 646 if (!access_ok(frame, sizeof(*frame))) 643 647 goto badframe; 644 - if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) 648 + if (__get_user(*(__u64 *)&set, (__u64 __user *)&frame->uc.uc_sigmask)) 645 649 goto badframe; 646 650 if (__get_user(uc_flags, &frame->uc.uc_flags)) 647 651 goto badframe; ··· 866 870 867 871 if (!access_ok(frame, sizeof(*frame))) 868 872 goto badframe; 869 - if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) 873 + if (__get_user(set.sig[0], (__u64 __user *)&frame->uc.uc_sigmask)) 870 874 goto badframe; 871 875 if (__get_user(uc_flags, &frame->uc.uc_flags)) 872 876 goto badframe;