lkml.org 
[lkml]   [2014]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 048/122] drm: fix NULL pointer access by wrong ioctl
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Zhaowei Yuan <zhaowei.yuan@samsung.com>

    commit 1539fb9bd405ee32282ea0a38404f9e008ac5b7a upstream.

    If user uses wrong ioctl command with _IOC_NONE and argument size
    greater than 0, it can cause NULL pointer access from memset of line
    463. If _IOC_NONE, don't memset to 0 for kdata.

    Signed-off-by: Zhaowei Yuan <zhaowei.yuan@samsung.com>
    Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/drm_drv.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/gpu/drm/drm_drv.c
    +++ b/drivers/gpu/drm/drm_drv.c
    @@ -419,8 +419,9 @@ long drm_ioctl(struct file *filp,
    retcode = -EFAULT;
    goto err_i1;
    }
    - } else
    + } else if (cmd & IOC_OUT) {
    memset(kdata, 0, usize);
    + }

    if (ioctl->flags & DRM_UNLOCKED)
    retcode = func(dev, kdata, file_priv);



    \
     
     \ /
      Last update: 2014-07-08 04:01    [W:4.180 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site