linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shi Weihua <shiwh@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org,
	Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH 1/5] signal(x86_32): Improve the signal stack overflow check
Date: Mon, 18 Feb 2008 18:22:05 +0800	[thread overview]
Message-ID: <47B95C4D.6080000@cn.fujitsu.com> (raw)

We need to check for stack overflow only when the signal is on stack.
So we can improve the patch "http://lkml.org/lkml/2007/11/27/101" as following. 

Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com> 

---
--- linux-2.6.25-rc2.orig/arch/x86/kernel/signal_32.c	2008-02-16 04:57:20.000000000 +0800
+++ linux-2.6.25-rc2/arch/x86/kernel/signal_32.c	2008-02-18 18:06:39.000000000 +0800
@@ -299,17 +299,21 @@ get_sigframe(struct k_sigaction *ka, str
 	/* Default to using normal stack */
 	sp = regs->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.
-	 */
-	if (on_sig_stack(sp) && !likely(on_sig_stack(sp - frame_size)))
-		return (void __user *) -1L;
-
 	/* 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. */


             reply	other threads:[~2008-02-18 10:24 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-18 10:22 Shi Weihua [this message]
2008-02-18 13:47 ` [PATCH 1/5] signal(x86_32): Improve the signal stack overflow check Ingo Molnar
2008-02-19  0:58   ` Shi Weihua
2008-02-19 18:50     ` Roland McGrath
2008-02-20  0:49       ` Shi Weihua
2008-02-20  1:18         ` Roland McGrath
2008-02-20  1:35           ` Shi Weihua
2008-02-20  1:44             ` Roland McGrath
2008-02-20  2:23               ` Shi Weihua
2008-02-20  2:49                 ` Roland McGrath
2008-02-20  2:59                   ` Shi Weihua
2008-02-20  5:54                   ` Harvey Harrison
2008-02-20  7:59                     ` Roland McGrath
2008-02-20 10:27                   ` Ingo Molnar
2008-02-18 18:05 ` Valdis.Kletnieks
2008-02-19  2:11   ` Shi Weihua
2008-02-19  2:19 ` Shi Weihua
2008-02-19 11:05   ` Ingo Molnar
2008-02-19 23:21     ` Paul Mackerras
2008-02-19 23:25       ` H. Peter Anvin
2008-02-20  0:03         ` Roland McGrath
2008-02-20  0:04       ` Roland McGrath

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=47B95C4D.6080000@cn.fujitsu.com \
    --to=shiwh@cn.fujitsu.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).