From 176c359b0b18b106c17b6d1da7e3e6a731e203af Mon Sep 17 00:00:00 2001
From: Dan Rosenberg <drosenberg@vsecurity.com>
Date: Mon, 25 Jul 2011 17:11:53 -0700
Subject: [PATCH] --- yaml --- r: 258923 b: refs/heads/master c:
 0d0138ebe24b94065580bd2601f8bb7eb6152f56 h: refs/heads/master i:   258921:
 e583987e612edfdbee831d8d97f0995b30e62299   258919:
 c71623cf953f336a9f4461cfd135b274c903da81 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/xtensa/kernel/ptrace.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cb08fbd7cc17..19e46b20163d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67db392d1124e14684e23deb572de2a63b9b3b69
+refs/heads/master: 0d0138ebe24b94065580bd2601f8bb7eb6152f56
diff --git a/trunk/arch/xtensa/kernel/ptrace.c b/trunk/arch/xtensa/kernel/ptrace.c
index c72c9473ef99..a0d042aa2967 100644
--- a/trunk/arch/xtensa/kernel/ptrace.c
+++ b/trunk/arch/xtensa/kernel/ptrace.c
@@ -147,6 +147,9 @@ int ptrace_setxregs(struct task_struct *child, void __user *uregs)
 	elf_xtregs_t *xtregs = uregs;
 	int ret = 0;
 
+	if (!access_ok(VERIFY_READ, uregs, sizeof(elf_xtregs_t)))
+		return -EFAULT;
+
 #if XTENSA_HAVE_COPROCESSORS
 	/* Flush all coprocessors before we overwrite them. */
 	coprocessor_flush_all(ti);