From 335fe5c1c6d2ab5e589862c03fa5c8be99dffdb7 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Tue, 21 Feb 2012 12:29:03 +0100
Subject: [PATCH] --- yaml --- r: 298541 b: refs/heads/master c:
 5a4f5da543b169d555a19e889850780ddceb8f98 h: refs/heads/master i:   298539:
 42b1f31c315d4b7f472d26034987293e183f7ecc v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/kernel/ptrace.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cb94aa429944..95cfc2abd1e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa0d1dbf7fb6b6f1af85d298a4054fe9edc914c9
+refs/heads/master: 5a4f5da543b169d555a19e889850780ddceb8f98
diff --git a/trunk/arch/arm/kernel/ptrace.c b/trunk/arch/arm/kernel/ptrace.c
index 45956c9d0ef0..80abafb9bf33 100644
--- a/trunk/arch/arm/kernel/ptrace.c
+++ b/trunk/arch/arm/kernel/ptrace.c
@@ -256,7 +256,7 @@ static int ptrace_read_user(struct task_struct *tsk, unsigned long off,
 {
 	unsigned long tmp;
 
-	if (off & 3 || off >= sizeof(struct user))
+	if (off & 3)
 		return -EIO;
 
 	tmp = 0;
@@ -268,6 +268,8 @@ static int ptrace_read_user(struct task_struct *tsk, unsigned long off,
 		tmp = tsk->mm->end_code;
 	else if (off < sizeof(struct pt_regs))
 		tmp = get_user_reg(tsk, off >> 2);
+	else if (off >= sizeof(struct user))
+		return -EIO;
 
 	return put_user(tmp, ret);
 }