aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Rosenberg <drosenberg@vsecurity.com>2011-07-25 17:11:53 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:39 -0700
commitf7ac7c5b73c4f78f83202f8ec54ef1a73b9c5abe (patch)
tree4b346639150d015b87b65447bdaa7f1bfe3d33a9
parent650957da7699e730e78e82735b8c2595fcf7794a (diff)
downloadkernel_samsung_espresso10-f7ac7c5b73c4f78f83202f8ec54ef1a73b9c5abe.zip
kernel_samsung_espresso10-f7ac7c5b73c4f78f83202f8ec54ef1a73b9c5abe.tar.gz
kernel_samsung_espresso10-f7ac7c5b73c4f78f83202f8ec54ef1a73b9c5abe.tar.bz2
xtensa: prevent arbitrary read in ptrace
commit 0d0138ebe24b94065580bd2601f8bb7eb6152f56 upstream. Prevent an arbitrary kernel read. Check the user pointer with access_ok() before copying data in. [akpm@linux-foundation.org: s/EIO/EFAULT/] Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com> Cc: Christian Zankel <chris@zankel.net> Cc: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/xtensa/kernel/ptrace.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/ptrace.c b/arch/xtensa/kernel/ptrace.c
index c72c947..a0d042a 100644
--- a/arch/xtensa/kernel/ptrace.c
+++ b/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);