---

yaml --- r: 168993 b: refs/heads/master c: 3336f4f h: refs/heads/master i: 168991: bef4b4b v: v3
git-mirror · Nov 23, 2009 · 161761c · 161761c
1 parent aebf9ac
commit 161761c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cefbf4ea629427af2fb4709bab9fe126dcddc234
+refs/heads/master: 3336f4f08e0dad7a2b6493c80b49b685141d53ad
diff --git a/trunk/arch/arm/kernel/signal.c b/trunk/arch/arm/kernel/signal.c
@@ -662,8 +662,12 @@ static void do_signal(struct pt_regs *regs, int syscall)
 				regs->ARM_sp -= 4;
 				usp = (u32 __user *)regs->ARM_sp;
 
-				put_user(regs->ARM_pc, usp);
-				regs->ARM_pc = KERN_RESTART_CODE;
+				if (put_user(regs->ARM_pc, usp) == 0) {
+					regs->ARM_pc = KERN_RESTART_CODE;
+				} else {
+					regs->ARM_sp += 4;
+					force_sigsegv(0, current);
+				}
 #endif
 			}
 		}