Backport commit bcd6aa7b6cbf ("drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define()") to linux-5.1-stable
Subsystems (4)
PATCH 1/1 Backport commit bcd6aa7b6cbf ("drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define()") to linux-5.1-stable
Commit bcd6aa7b6cbf ("drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define()") upstream.
That commit resolved a NULL pointer dereference in vmw_view_add(), which occurred if SVGA_3D_CMD_DX_DEFINE_RENDERTARGET_VIEW was called with a surface ID of SVGA3D_INVALID_ID.
(The original patch failed to apply cleanly in 5.1-stable as VMW_DEBUG_USER does not exist here.)
Signed-off-by Murray McAllister <[email protected]>
--- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +4 -0
@@ -2574,6 +2574,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);
Signature · 1 line
2.20.1