lkml.org 
[lkml]   [2019]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 57/84] drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define()
    Date
    From: Murray McAllister <murray.mcallister@gmail.com>

    commit bcd6aa7b6cbfd6f985f606c6f76046d782905820 upstream.

    If SVGA_3D_CMD_DX_DEFINE_RENDERTARGET_VIEW is called with a surface
    ID of SVGA3D_INVALID_ID, the srf struct will remain NULL after
    vmw_cmd_res_check(), leading to a null pointer dereference in
    vmw_view_add().

    Cc: <stable@vger.kernel.org>
    Fixes: d80efd5cb3de ("drm/vmwgfx: Initial DX support")
    Signed-off-by: Murray McAllister <murray.mcallister@gmail.com>
    Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


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

    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
    @@ -2682,6 +2682,10 @@ static int vmw_cmd_dx_view_define(struct
    if (view_type == vmw_view_max)
    return -EINVAL;
    cmd = container_of(header, typeof(*cmd), header);
    + if (unlikely(cmd->sid == SVGA3D_INVALID_ID)) {
    + DRM_ERROR("Invalid surface id.\n");
    + return -EINVAL;
    + }
    ret = vmw_cmd_res_check(dev_priv, sw_context, vmw_res_surface,
    user_surface_converter,
    &cmd->sid, &srf_node);

    \
     
     \ /
      Last update: 2019-06-20 20:00    [W:2.207 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site