---

yaml --- r: 367945 b: refs/heads/master c: 9cdae82 h: refs/heads/master i: 367943: 4ccdc5a v: v3
git-mirror · May 1, 2013 · 75937ad · 75937ad
1 parent f0d4829
commit 75937ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a11e67c2611d483622aad007a3533e7dfbea700e
+refs/heads/master: 9cdae82d14f8f9e272304dccb48434482e57d43c
diff --git a/trunk/arch/hexagon/kernel/signal.c b/trunk/arch/hexagon/kernel/signal.c
@@ -41,6 +41,10 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
 {
 	unsigned long sp = regs->r29;
 
+	/* check if we would overflow the alt stack */
+	if (on_sig_stack(sp) && !likely(on_sig_stack(sp - frame_size)))
+		return (void __user __force *)-1UL;
+
 	/* Switch to signal stack if appropriate */
 	if ((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0))
 		sp = current->sas_ss_sp + current->sas_ss_size;