diff --git a/[refs] b/[refs]
index 86180f12cf70..cd70663aac62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 312df5f1a1da780e084b328bcabb02a6dcd044c3
+refs/heads/master: d1099e8a18960693c04507bdd7b9403db70bfd97
diff --git a/trunk/arch/x86_64/kernel/ptrace.c b/trunk/arch/x86_64/kernel/ptrace.c
index e26e86bb56fe..892212161aa8 100644
--- a/trunk/arch/x86_64/kernel/ptrace.c
+++ b/trunk/arch/x86_64/kernel/ptrace.c
@@ -277,6 +277,11 @@ static int putreg(struct task_struct *child,
 				return -EIO;
 			value &= 0xffff;
 			break;
+		case offsetof(struct user_regs_struct, rip):
+			/* Check if the new RIP address is canonical */
+			if (value >= TASK_SIZE)
+				return -EIO;
+			break;
 	}
 	put_stack_long(child, regno - sizeof(struct pt_regs), value);
 	return 0;