lkml.org 
[lkml]   [2017]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 188/212] drm/vmwgfx: NULL pointer dereference in vmw_surface_define_ioctl()
    3.16.44-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Murray McAllister <murray.mcallister@insomniasec.com>

    commit 36274ab8c596f1240c606bb514da329add2a1bcd upstream.

    Before memory allocations vmw_surface_define_ioctl() checks the
    upper-bounds of a user-supplied size, but does not check if the
    supplied size is 0.

    Add check to avoid NULL pointer dereferences.

    Signed-off-by: Murray McAllister <murray.mcallister@insomniasec.com>
    Reviewed-by: Sinclair Yeh <syeh@vmware.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
    @@ -714,8 +714,8 @@ int vmw_surface_define_ioctl(struct drm_
    for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i)
    num_sizes += req->mip_levels[i];

    - if (num_sizes > DRM_VMW_MAX_SURFACE_FACES *
    - DRM_VMW_MAX_MIP_LEVELS)
    + if (num_sizes > DRM_VMW_MAX_SURFACE_FACES * DRM_VMW_MAX_MIP_LEVELS ||
    + num_sizes == 0)
    return -EINVAL;

    size = vmw_user_surface_size + 128 +
    \
     
     \ /
      Last update: 2017-06-01 18:05    [W:4.058 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site