]> git.hungrycats.org Git - linux/commitdiff
autofs4: check dev ioctl size before allocating
authorSasha Levin <sasha.levin@oracle.com>
Tue, 8 Apr 2014 23:04:11 +0000 (16:04 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 9 May 2015 22:16:19 +0000 (23:16 +0100)
commit e53d77eb8bb616e903e34cc7a918401bee3b5149 upstream.

There wasn't any check of the size passed from userspace before trying
to allocate the memory required.

This meant that userspace might request more space than allowed,
triggering an OOM.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Ian Kent <raven@themaw.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
fs/autofs4/dev-ioctl.c

index de542716245e0cf0648f07f11ac2001f1e61e115..868101ccbefa456cac364cd04a25423ace9be7e0 100644 (file)
@@ -103,6 +103,9 @@ static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *i
        if (tmp.size < sizeof(tmp))
                return ERR_PTR(-EINVAL);
 
+       if (tmp.size > (PATH_MAX + sizeof(tmp)))
+               return ERR_PTR(-ENAMETOOLONG);
+
        return memdup_user(in, tmp.size);
 }