[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-0f8f308925ebe0480bd9831d32963ee0b885e24b@git.kernel.org>
Date: Wed, 1 Apr 2009 15:16:09 GMT
From: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, h-shimamoto@...jp.nec.com,
hpa@...or.com, mingo@...hat.com, oleg@...hat.com,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/urgent] x86: signal: check sas_ss_size instead of sas_ss_flags()
Commit-ID: 0f8f308925ebe0480bd9831d32963ee0b885e24b
Gitweb: http://git.kernel.org/tip/0f8f308925ebe0480bd9831d32963ee0b885e24b
Author: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
AuthorDate: Thu, 26 Mar 2009 10:03:08 -0700
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Wed, 1 Apr 2009 17:13:17 +0200
x86: signal: check sas_ss_size instead of sas_ss_flags()
Impact: fix redundant and incorrect check
Oleg Nesterov noticed wrt commit:
14fc9fb: x86: signal: check signal stack overflow properly
>> No need to check SA_ONSTACK if we're already using alternate signal stack.
>
> Yes, but this also mean that we don't need sas_ss_flags() under
> "if (!onsigstack)",
Checking on_sig_stack() in sas_ss_flags() at get_sigframe() is redundant
and not correct on 64 bit. To check sas_ss_size is enough.
Reported-by: Oleg Nesterov <oleg@...hat.com>
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@...jp.nec.com>
Cc: roland@...hat.com
LKML-Reference: <49CBB54C.5080201@...jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/signal.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index dfcc74a..1442516 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -221,7 +221,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
if (!onsigstack) {
/* This is the X/Open sanctioned signal stack switching. */
if (ka->sa.sa_flags & SA_ONSTACK) {
- if (sas_ss_flags(sp) == 0)
+ if (current->sas_ss_size)
sp = current->sas_ss_sp + current->sas_ss_size;
} else {
#ifdef CONFIG_X86_32
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists