signal(x86_ia32): add a signal stack overflow check
PATCH 3/5 signal(x86_ia32): 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 x86_ia32 and improve it a liitle bit in that we need to check for stack overflow only when the signal is on stack.
---
arch/x86/ia32/ia32_signal.c +12 -1
@@ -406,8 +406,19 @@ static void __user *get_sigframe(struct/* This is the X/Open sanctioned signal stack switching. */ if (ka->sa.sa_flags &SA_ONSTACK ) { -if (sas_ss_flags (sp) ==0 ) +int onstack =sas_ss_flags (sp); + +if (onstack ==0 ) sp = current->sas_ss_sp + current->sas_ss_size; +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 (sp - frame_size))) +return (void __user *)-1L ; + } }/* This is the legacy signal stack switching. */
The similar check has been added to x86_32(i386) in commit id 83bd01024b1fdfc41d9b758e5669e80fca72df66.
So we add this check to x86_ia32 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/x86/ia32/ia32_signal.c +12 -1
@@ -406,8 +406,19 @@ static void __user *get_sigframe(struct/* This is the X/Open sanctioned signal stack switching. */ if (ka->sa.sa_flags &SA_ONSTACK ) { -if (sas_ss_flags (sp) ==0 ) +int onstack =sas_ss_flags (sp); + +if (onstack ==0 ) sp = current->sas_ss_sp + current->sas_ss_size; +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 (sp - frame_size))) +return (void __user *)-1L ; + } }/* This is the legacy signal stack switching. */
Ingo Molnar
AppliedQuoted 4 lines · Shi Weihua
The similar check has been added to
x86_32(i386)in commit id83bd01024b1fdfc41d9b758e5669e80fca72df66. So we add this check tox86_ia32and improve it a liitle bit in that we need to check for stack overflow only when the signal is on stack.
thanks, applied.
Ingo