lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 099/119] drm/vmwgfx: limit the number of mip levels in vmw_gb_surface_define_ioctl()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Vladis Dronov <vdronov@redhat.com>

    commit ee9c4e681ec4f58e42a83cb0c22a0289ade1aacf upstream.

    The 'req->mip_levels' parameter in vmw_gb_surface_define_ioctl() is
    a user-controlled 'uint32_t' value which is used as a loop count limit.
    This can lead to a kernel lockup and DoS. Add check for 'req->mip_levels'.

    References:
    https://bugzilla.redhat.com/show_bug.cgi?id=1437431

    Signed-off-by: Vladis Dronov <vdronov@redhat.com>
    Reviewed-by: Sinclair Yeh <syeh@vmware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
    @@ -1280,6 +1280,9 @@ int vmw_gb_surface_define_ioctl(struct d
    if (req->multisample_count != 0)
    return -EINVAL;

    + if (req->mip_levels > DRM_VMW_MAX_MIP_LEVELS)
    + return -EINVAL;
    +
    if (unlikely(vmw_user_surface_size == 0))
    vmw_user_surface_size = ttm_round_pot(sizeof(*user_srf)) +
    128;

    \
     
     \ /
      Last update: 2017-06-12 18:30    [W:4.110 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site