x86: signal: get give_sigsegv of setup frames together
PATCH 1/3 x86: signal: get give_sigsegv of setup frames together
From: Hiroshi Shimamoto <[email protected]>
When setup frame failed, force_sigsegv is called and returns -EFAULT. There are same code in ia32_setup_fram(), ia32_setup_rt_frame(), __setup_frame() and __setup_rt_frame().
Get them together.
--- arch/x86/ia32/ia32_signal.c | 26 +++++++++----------------- arch/x86/kernel/signal_32.c | 31 ++++++++++++++----------------- arch/x86/kernel/signal_64.c | 17 +++++++++-------- 3 files changed, 32 insertions(+), 42 deletions(-)
arch/x86/ia32/ia32_signal.c +9 -17
@@ -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 ) {
@@ -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;
@@ -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,
@@ -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)
@@ -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;
@@ -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;
@@ -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 ; }
arch/x86/kernel/signal_32.c +14 -17
@@ -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)
@@ -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;
@@ -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,
@@ -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)
@@ -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);
@@ -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;
@@ -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 ; }/*
@@ -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; }
arch/x86/kernel/signal_64.c +9 -8
@@ -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. */
@@ -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;
@@ -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 ; }/*
@@ -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; }
Signature · 1 line
1.5.6
PATCH 2/3 x86: signal: remove unneeded err handling
From: Hiroshi Shimamoto <[email protected]>
This patch eliminates unused or unneeded variable handling.
--- arch/x86/ia32/ia32_signal.c | 11 ++++------- arch/x86/kernel/signal_32.c | 11 ++++------- arch/x86/kernel/signal_64.c | 5 ++--- 3 files changed, 10 insertions(+), 17 deletions(-)
arch/x86/ia32/ia32_signal.c +4 -7
@@ -446,18 +446,15 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame)))return -EFAULT ; - err |=__put_user (sig, &frame->sig); -if (err) +if (__put_user (sig, &frame->sig))return -EFAULT ; - err |=ia32_setup_sigcontext (&frame->sc, fpstate, regs, set->sig[0 ]); -if (err) +if (ia32_setup_sigcontext (&frame->sc, fpstate, regs, set->sig[0 ]))return -EFAULT ;if (_COMPAT_NSIG_WORDS >1 ) { - err |=__copy_to_user (frame->extramask, &set->sig[1 ], -sizeof (frame->extramask)); -if (err) +if (__copy_to_user (frame->extramask, &set->sig[1 ], +sizeof (frame->extramask)))return -EFAULT ; }
arch/x86/kernel/signal_32.c +4 -7
@@ -351,18 +351,15 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,if (!access_ok (VERIFY_WRITE , frame,sizeof (*frame)))return -EFAULT ; - err =__put_user (sig, &frame->sig); -if (err) +if (__put_user (sig, &frame->sig))return -EFAULT ; - err =setup_sigcontext (&frame->sc, fpstate, regs, set->sig[0 ]); -if (err) +if (setup_sigcontext (&frame->sc, fpstate, regs, set->sig[0 ]))return -EFAULT ;if (_NSIG_WORDS >1 ) { - err =__copy_to_user (&frame->extramask, &set->sig[1 ], -sizeof (frame->extramask)); -if (err) +if (__copy_to_user (&frame->extramask, &set->sig[1 ], +sizeof (frame->extramask)))return -EFAULT ; }
arch/x86/kernel/signal_64.c +2 -3
@@ -210,7 +210,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, (unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;if (save_i387_xstate (fp) <0 ) - err |=-1 ; +return -EFAULT ; }else frame =get_stack (ka, regs,sizeof (struct rt_sigframe )) -8 ;
@@ -218,8 +218,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,return -EFAULT ;if (ka->sa.sa_flags &SA_SIGINFO ) { - err |=copy_siginfo_to_user (&frame->info, info); -if (err) +if (copy_siginfo_to_user (&frame->info, info))return -EFAULT ; }
Signature · 1 line
1.5.6
PATCH 3/3 x86: signal: make do_rt_sigreturn()
In reply to Hiroshi ShimamotoFrom: Hiroshi Shimamoto <[email protected]>
make do_rt_sigreturn() to collect common part of sys_rt_sigreturn().
--- arch/x86/kernel/signal_32.c | 12 +++++++++--- arch/x86/kernel/signal_64.c | 11 ++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-)
arch/x86/kernel/signal_32.c +9 -3
@@ -215,9 +215,8 @@ badframe:return 0 ; } -asmlinkage int sys_rt_sigreturn(unsigned long __unused) +static long do_rt_sigreturn (struct pt_regs *regs) { -struct pt_regs *regs = (struct pt_regs *)&__unused;struct rt_sigframe __user *frame;unsigned long ax;sigset_t set;
@@ -243,10 +242,17 @@ asmlinkage int sys_rt_sigreturn(unsigned long __unused)return ax; badframe: -signal_fault (regs, frame,"rt sigreturn" ); +signal_fault (regs, frame,"rt_sigreturn" );return 0 ; } +asmlinkage int sys_rt_sigreturn(unsigned long __unused) +{ +struct pt_regs *regs = (struct pt_regs *)&__unused; + +return do_rt_sigreturn (regs); +} +/* * Set up a signal frame. */
arch/x86/kernel/signal_64.c +8 -3
@@ -104,11 +104,11 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,return err; } -asmlinkage long sys_rt_sigreturn (struct pt_regs *regs) +static long do_rt_sigreturn (struct pt_regs *regs) {struct rt_sigframe __user *frame; -sigset_t set;unsigned long ax; +sigset_t set; frame = (struct rt_sigframe __user *)(regs->sp -sizeof (long ));if (!access_ok (VERIFY_READ , frame,sizeof (*frame)))
@@ -131,10 +131,15 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)return ax; badframe: -signal_fault (regs, frame,"sigreturn" ); +signal_fault (regs, frame,"rt_sigreturn" );return 0 ; } +asmlinkage long sys_rt_sigreturn (struct pt_regs *regs) +{ +return do_rt_sigreturn (regs); +} +/* * Set up a signal frame. */
Signature · 1 line
1.5.6
Quoted 8 lines · Hiroshi Shimamoto
From: Hiroshi Shimamoto <[email protected]>
When setup frame failed,
force_sigsegvis called and returns-EFAULT. There are same code inia32_setup_fram(),ia32_setup_rt_frame(),__setup_frame()and__setup_rt_frame().
Get them together.Signed-off-by Hiroshi Shimamoto <[email protected]>
applied your three signal code unification patches to tip/x86/signal:
e6babb6: x86: signal: introduce do_rt_sigreturn() 2ba48e1: x86: signal: remove unneeded err handling 3d0aedd: x86: signal: put give_sigsegv of setup frames together
thanks!
Ingo