From 4f900621952e02643c8a6bcbc500d30a1bef84eb Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Wed, 13 Mar 2013 14:59:33 -0700
Subject: [PATCH] --- yaml --- r: 361283 b: refs/heads/master c:
 2ca39528c01a933f6689cd6505ce65bd6d68a530 h: refs/heads/master i:   361281:
 5105058d204e9bfbfa6117c31a2968835135997c   361279:
 69f1184200e0ccdcd4886eb1a625c30380f593fa v: v3

---
 [refs]                | 2 +-
 trunk/kernel/signal.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 404475cfdcc5..76fcfd7acd66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8749452adcddd62e3707709ec2ae4856e70a3f2
+refs/heads/master: 2ca39528c01a933f6689cd6505ce65bd6d68a530
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index d63c79e7e415..43b0d4a1b7ba 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -485,6 +485,9 @@ 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
+		ka->sa.sa_restorer = NULL;
+#endif
 		sigemptyset(&ka->sa.sa_mask);
 		ka++;
 	}