lkml.org 
[lkml]   [2015]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 3.2 059/221] autofs4: check dev ioctl size before allocating
    From
    Date
    On Tue, 2015-05-05 at 02:16 +0100, Ben Hutchings wrote:
    > 3.2.69-rc1 review patch. If anyone has any objections, please let me know.

    Perhaps you should also consider including commit 0a280962 along with
    this one.

    >
    > ------------------
    >
    > From: Sasha Levin <sasha.levin@oracle.com>
    >
    > 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 | 3 +++
    > 1 file changed, 3 insertions(+)
    >
    > --- a/fs/autofs4/dev-ioctl.c
    > +++ b/fs/autofs4/dev-ioctl.c
    > @@ -103,6 +103,9 @@ static struct autofs_dev_ioctl *copy_dev
    > 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);
    > }
    >
    >




    \
     
     \ /
      Last update: 2015-05-05 08:01    [W:5.753 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site