From 51bb183ad5042d064608d760362056fb2de4e420 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 13 Feb 2007 13:26:24 +0100
Subject: [PATCH] --- yaml --- r: 48452 b: refs/heads/master c:
 f49481bc50fce428521497977861b8115666dbe7 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86_64/kernel/ptrace.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 765c9ed422e1..4efc0c6d3e16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f7a2a79c3ebb44f8b1b7d9b4fd3a650eb69e544
+refs/heads/master: f49481bc50fce428521497977861b8115666dbe7
diff --git a/trunk/arch/x86_64/kernel/ptrace.c b/trunk/arch/x86_64/kernel/ptrace.c
index addc14af0c56..4326a690a509 100644
--- a/trunk/arch/x86_64/kernel/ptrace.c
+++ b/trunk/arch/x86_64/kernel/ptrace.c
@@ -536,8 +536,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 		}
 		ret = 0;
 		for (ui = 0; ui < sizeof(struct user_regs_struct); ui += sizeof(long)) {
-			ret |= __get_user(tmp, (unsigned long __user *) data);
-			putreg(child, ui, tmp);
+			ret = __get_user(tmp, (unsigned long __user *) data);
+			if (ret)
+				break;
+			ret = putreg(child, ui, tmp);
+			if (ret)
+				break;
 			data += sizeof(long);
 		}
 		break;