aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2013-10-29 22:06:04 +0300
committerBen Hutchings <ben@decadent.org.uk>2013-11-28 14:02:06 +0000
commit02c54b6cf2b7bd1089bef485d7a81bdf0c5999d8 (patch)
treea866589802c3f487f847c8ef406852916399c058 /arch/um
parenta3537782a1a2765778cc89ca60dd779eef7092b6 (diff)
downloadkernel_samsung_smdk4412-02c54b6cf2b7bd1089bef485d7a81bdf0c5999d8.zip
kernel_samsung_smdk4412-02c54b6cf2b7bd1089bef485d7a81bdf0c5999d8.tar.gz
kernel_samsung_smdk4412-02c54b6cf2b7bd1089bef485d7a81bdf0c5999d8.tar.bz2
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: Ben Hutchings <ben@decadent.org.uk>
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 829df49..41ebbfe 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);