lkml.org 
[lkml]   [2015]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 123/143] autofs4 copy_dev_ioctl(): keep the value of ->size we'd used for allocation
    Date
    3.13.11-ckt18 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Al Viro <viro@zeniv.linux.org.uk>

    commit 0a280962dc6e117e0e4baa668453f753579265d9 upstream.

    X-Coverup: just ask spender
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    fs/autofs4/dev-ioctl.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/fs/autofs4/dev-ioctl.c b/fs/autofs4/dev-ioctl.c
    index 1818ce7..214f1b5 100644
    --- a/fs/autofs4/dev-ioctl.c
    +++ b/fs/autofs4/dev-ioctl.c
    @@ -95,7 +95,7 @@ static int check_dev_ioctl_version(int cmd, struct autofs_dev_ioctl *param)
    */
    static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *in)
    {
    - struct autofs_dev_ioctl tmp;
    + struct autofs_dev_ioctl tmp, *res;

    if (copy_from_user(&tmp, in, sizeof(tmp)))
    return ERR_PTR(-EFAULT);
    @@ -103,7 +103,11 @@ static struct autofs_dev_ioctl *copy_dev_ioctl(struct autofs_dev_ioctl __user *i
    if (tmp.size < sizeof(tmp))
    return ERR_PTR(-EINVAL);

    - return memdup_user(in, tmp.size);
    + res = memdup_user(in, tmp.size);
    + if (!IS_ERR(res))
    + res->size = tmp.size;
    +
    + return res;
    }

    static inline void free_dev_ioctl(struct autofs_dev_ioctl *param)
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-03-31 22:21    [W:2.153 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site