Patchwork [2/2] kernel/signal.c: use __ARCH_HAS_SA_RESTORER instead of SA_RESTORER

login
register
mail settings
Submitter Luis Henriques
Date March 22, 2013, 6:35 p.m.
Message ID <1363977330-20620-3-git-send-email-luis.henriques@canonical.com>
Download mbox | patch
Permalink /patch/230239/
State New
Headers show

Comments

Luis Henriques - March 22, 2013, 6:35 p.m.
From: Andrew Morton <akpm@linux-foundation.org>

CVE-2013-0914

BugLink: http://bugs.launchpad.net/bugs/1153813

__ARCH_HAS_SA_RESTORER is the preferred conditional for use in 3.9 and
later kernels, per Kees.

Cc: Emese Revfy <re.emese@gmail.com>
Cc: Emese Revfy <re.emese@gmail.com>
Cc: PaX Team <pageexec@freemail.hu>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Serge Hallyn <serge.hallyn@canonical.com>
Cc: Julien Tinnes <jln@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 522cff142d7d2f9230839c9e1f21a4d8bcc22a4a)

Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 kernel/signal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/kernel/signal.c b/kernel/signal.c
index 1929014..1c6675b 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -320,7 +320,7 @@  flush_signal_handlers(struct task_struct *t, int force_default)
 		if (force_default || ka->sa.sa_handler != SIG_IGN)
 			ka->sa.sa_handler = SIG_DFL;
 		ka->sa.sa_flags = 0;
-#ifdef SA_RESTORER
+#ifdef __ARCH_HAS_SA_RESTORER
 		ka->sa.sa_restorer = NULL;
 #endif
 		sigemptyset(&ka->sa.sa_mask);