aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68knommu
diff options
context:
space:
mode:
authorLaurent MEYER <meyerlau@fr.ibm.com>2006-06-23 05:05:36 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:05 -0400
commitd09042da7284a86ffbdd18695f517a71514ed598 (patch)
tree09e9a3de71a4a4cf6c8f8cb0c40ec0a916e01cae /arch/m68knommu
parent785d55708c24c28d7646f3d1fe6c9f82fb714311 (diff)
[PATCH] fix incorrect SA_ONSTACK behaviour for 64-bit processes
- When setting a sighandler using sigaction() call, if the flag SA_ONSTACK is set and no alternate stack is provided via sigaltstack(), the kernel still try to install the alternate stack. This behavior is the opposite of the one which is documented in Single Unix Specifications V3. - Also when setting an alternate stack using sigaltstack() with the flag SS_DISABLE, the kernel try to install the alternate stack on signal delivery. These two use cases makes the process crash at signal delivery. Signed-off-by: Laurent Meyer <meyerlau@fr.ibm.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: David Howells <dhowells@redhat.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Roman Zippel <zippel@linux-m68k.org> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Paul Mundt <lethal@linux-sh.org> Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68knommu')
-rw-r--r--arch/m68knommu/kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c
index e1b3aa39e270..8e2c5a88efa7 100644
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
@@ -553,7 +553,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
553 553
554 /* This is the X/Open sanctioned signal stack switching. */ 554 /* This is the X/Open sanctioned signal stack switching. */
555 if (ka->sa.sa_flags & SA_ONSTACK) { 555 if (ka->sa.sa_flags & SA_ONSTACK) {
556 if (!on_sig_stack(usp)) 556 if (!sas_ss_flags(usp))
557 usp = current->sas_ss_sp + current->sas_ss_size; 557 usp = current->sas_ss_sp + current->sas_ss_size;
558 } 558 }
559 return (void *)((usp - frame_size) & -8UL); 559 return (void *)((usp - frame_size) & -8UL);