signal(ia64): add a signal stack overflow check
PATCH 4/5 signal(ia64): add a signal stack overflow check
The similar check has been added to x86_32(i386) in commit id 83bd01024b1fdfc41d9b758e5669e80fca72df66.
So we add this check to ia64 and improve it a liitle bit in that we need to check for stack overflow only when the signal is on stack.
---
arch/ia64/kernel/signal.c +23 -9
@@ -342,15 +342,29 @@ setup_frame (int sig, struct k_sigaction new_sp = scr->pt.r12; tramp_addr = (unsigned long ) __kernel_sigtramp; -if ((ka->sa.sa_flags &SA_ONSTACK ) &&sas_ss_flags (new_sp) =0 ) { - new_sp = current->sas_ss_sp + current->sas_ss_size; -/* -* We need to check for the register stack being on the signal stack -* separately, because it's switched separately (memory stack is switched -* in the kernel, register stack is switched in the signal trampoline). -*/ -if (!rbs_on_sig_stack (scr->pt.ar_bspstore)) - new_rbs = (current->sas_ss_sp +sizeof (long ) -1 ) & ~(sizeof (long ) -1 ); +if (ka->sa.sa_flags &SA_ONSTACK ) { +int onstack =sas_ss_flags (new_sp); + +if (onstack =0 ) { + new_sp = current->sas_ss_sp + current->sas_ss_size; +/* +* We need to check for the register stack being on the +* signal stack separately, because it's switched +* separately (memory stack is switched in the kernel, +* register stack is switched in the signal trampoline). +*/ +if (!rbs_on_sig_stack (scr->pt.ar_bspstore)) + new_rbs = (current->sas_ss_sp + +sizeof (long ) -1 ) & ~(sizeof (long ) -1 ); + }else if (onstack =SS_ONSTACK ) { +/* +* If we are on the alternate signal stack and would +* overflow it, don't return an always-bogus address +* instead so we will die with SIGSEGV. +*/ +if (!likely (on_sig_stack (new_sp -sizeof (*frame)))) +return force_sigsegv_info (sig, frame); + } } frame = (void __user *) ((new_sp -sizeof (*frame)) & -STACK_ALIGN );
arch/ia64/kernel/signal.c setup_frame (int sig, struct k_sigaction · line 358
Quoted 3 lines · Shi Weihua
arch/ia64/kernel/signal.c +3
-0+if (!rbs_on_sig_stack (scr->pt.ar_bspstore)) + new_rbs = (current->sas_ss_sp + +sizeof (long ) -1 ) & ~(sizeof (long ) -1 );
I know you're only moving this code, but how about fixing it to use ALIGN at the same time?
+ if (!rbs_on_sig_stack(scr->pt.ar_bspstore))
+ new_rbs = ALIGN(current->sas_ss_sp,
+ sizeof(long));
Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine "Bill, look, we understand that you're interested in selling us this operating system, but compare it to ours. We can't possibly take such a retrograde step."
Matthew Wilcox wrote::
Review
Quoted 12 lines · Shi Weihua
Review
Quoted 3 lines
(quoted diff) +3
-0+ if (!rbs_on_sig_stack(scr->pt.ar_bspstore)) + new_rbs = (current->sas_ss_sp + + sizeof(long) - 1) & ~(sizeof(long) - 1);I know you're only moving this code, but how about fixing it to use ALIGN at the same time?
(quoted diff) +3
-0+ if (!rbs_on_sig_stack(scr->pt.ar_bspstore)) + new_rbs = ALIGN(current->sas_ss_sp, + sizeof(long));
Of course,we can improve the code by ALIGN.
---
The similar check has been added to x86_32(i386) in commit id 83bd01024b1fdfc41d9b758e5669e80fca72df66.
So we add this check to ia64 and improve it a liitle bit in that we need to check for stack overflow only when the signal is on stack.
---
arch/ia64/kernel/signal.c +27 -9
@@ -342,15 +342,33 @@ setup_frame (int sig, struct k_sigaction new_sp = scr->pt.r12; tramp_addr = (unsigned long ) __kernel_sigtramp; -if ((ka->sa.sa_flags &SA_ONSTACK ) &&sas_ss_flags (new_sp) =0 ) { - new_sp = current->sas_ss_sp + current->sas_ss_size; -/* -* We need to check for the register stack being on the signal stack -* separately, because it's switched separately (memory stack is switched -* in the kernel, register stack is switched in the signal trampoline). -*/ -if (!rbs_on_sig_stack (scr->pt.ar_bspstore)) - new_rbs = (current->sas_ss_sp +sizeof (long ) -1 ) & ~(sizeof (long ) -1 ); +if (ka->sa.sa_flags &SA_ONSTACK ) { +int onstack =sas_ss_flags (new_sp); + +if (onstack =0 ) { + new_sp = current->sas_ss_sp + current->sas_ss_size; +/* +* We need to check for the register stack being on the +* signal stack separately, because it's switched +* separately (memory stack is switched in the kernel, +* register stack is switched in the signal trampoline). +*/ +if (!rbs_on_sig_stack (scr->pt.ar_bspstore)) + new_rbs =ALIGN (current->sas_ss_sp, +sizeof (long )); + }else if (onstack =SS_ONSTACK ) { +unsigned long check_sp; + +/* +* If we are on the alternate signal stack and would +* overflow it, don't. Return an always-bogus address +* instead so we will die with SIGSEGV. +*/ + check_sp = (new_sp -sizeof (*frame)) & -STACK_ALIGN ; +if (!likely (on_sig_stack (check_sp))) +return force_sigsegv_info (sig, (void __user *) + check_sp); + } } frame = (void __user *) ((new_sp -sizeof (*frame)) & -STACK_ALIGN );
The similar check has been added to x86_32(i386) in commit id 83bd01024b1fdfc41d9b758e5669e80fca72df66.
So we add this check to ia64 and improve it a liitle bit in that we need to check for stack overflow only when the signal is on stack.
---
The previous patch has a comment mistake. Now I correct it.
---
arch/ia64/kernel/signal.c +27 -9
@@ -342,15 +342,33 @@ setup_frame (int sig, struct k_sigaction new_sp = scr->pt.r12; tramp_addr = (unsigned long ) __kernel_sigtramp; -if ((ka->sa.sa_flags &SA_ONSTACK ) &&sas_ss_flags (new_sp) =0 ) { - new_sp = current->sas_ss_sp + current->sas_ss_size; -/* -* We need to check for the register stack being on the signal stack -* separately, because it's switched separately (memory stack is switched -* in the kernel, register stack is switched in the signal trampoline). -*/ -if (!rbs_on_sig_stack (scr->pt.ar_bspstore)) - new_rbs = (current->sas_ss_sp +sizeof (long ) -1 ) & ~(sizeof (long ) -1 ); +if (ka->sa.sa_flags &SA_ONSTACK ) { +int onstack =sas_ss_flags (new_sp); + +if (onstack =0 ) { + new_sp = current->sas_ss_sp + current->sas_ss_size; +/* +* We need to check for the register stack being on the +* signal stack separately, because it's switched +* separately (memory stack is switched in the kernel, +* register stack is switched in the signal trampoline). +*/ +if (!rbs_on_sig_stack (scr->pt.ar_bspstore)) + new_rbs =ALIGN (current->sas_ss_sp, +sizeof (long )); + }else if (onstack =SS_ONSTACK ) { +unsigned long check_sp; + +/* +* If we are on the alternate signal stack and would +* overflow it, don't. Return an always-bogus address +* instead so we will die with SIGSEGV. +*/ + check_sp = (new_sp -sizeof (*frame)) & -STACK_ALIGN ; +if (!likely (on_sig_stack (check_sp))) +return force_sigsegv_info (sig, (void __user *) + check_sp); + } } frame = (void __user *) ((new_sp -sizeof (*frame)) & -STACK_ALIGN );