summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-10-29 22:06:04 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-11-13 12:05:33 +0900
commit079584656265347f310c75fac6f863a6280a17e4 (patch)
tree3d702d4730c44744a752c4110031d2bd6392a7c8 /arch/um
parente668dd8e47c2bc39c7bc31529dbe21c6169290bf (diff)
downloadlinux-3.10-079584656265347f310c75fac6f863a6280a17e4.tar.gz
linux-3.10-079584656265347f310c75fac6f863a6280a17e4.tar.bz2
linux-3.10-079584656265347f310c75fac6f863a6280a17e4.zip
uml: check length in exitcode_proc_write()
commit 201f99f170df14ba52ea4c52847779042b7a623b upstream. We don't cap the size of buffer from the user so we could write past the end of the array here. Only root can write to this file. Reported-by: Nico Golde <nico@ngolde.de> Reported-by: Fabian Yamaguchi <fabs@goesec.de> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/kernel/exitcode.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c
index 829df49dee9..41ebbfebb33 100644
--- a/arch/um/kernel/exitcode.c
+++ b/arch/um/kernel/exitcode.c
@@ -40,9 +40,11 @@ static ssize_t exitcode_proc_write(struct file *file,
const char __user *buffer, size_t count, loff_t *pos)
{
char *end, buf[sizeof("nnnnn\0")];
+ size_t size;
int tmp;
- if (copy_from_user(buf, buffer, count))
+ size = min(count, sizeof(buf));
+ if (copy_from_user(buf, buffer, size))
return -EFAULT;
tmp = simple_strtol(buf, &end, 0);