diff options
| author | Murray McAllister | 2019-05-11 08:01:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-19 08:18:05 +0200 |
| commit | 15bc8e8d4dadcc72474bca56882afdb34909112c (patch) | |
| tree | fbb72a7fdbbb7fbf27c0bce9b28b54e092b58045 /drivers/gpu/drm/vmwgfx | |
| parent | drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invali... (diff) | |
| download | kernel-qcow2-linux-15bc8e8d4dadcc72474bca56882afdb34909112c.tar.gz kernel-qcow2-linux-15bc8e8d4dadcc72474bca56882afdb34909112c.tar.xz kernel-qcow2-linux-15bc8e8d4dadcc72474bca56882afdb34909112c.zip | |
drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define()
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>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c index c89bc783fe48..3834aa71c9c4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -2733,6 +2733,10 @@ static int vmw_cmd_dx_view_define(struct vmw_private *dev_priv, 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); |