1 files changed, 19 insertions, 1 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index 2ff7ba04d8c8..33533d126277 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -2010,6 +2010,11 @@ static int vmw_cmd_set_shader(struct vmw_private *dev_priv,
                 return 0;
 
         if (cmd->body.shid != SVGA3D_INVALID_ID) {
+                /*
+                 * This is the compat shader path - Per device guest-backed
+                 * shaders, but user-space thinks it's per context host-
+                 * backed shaders.
+                 */
                 res = vmw_shader_lookup(vmw_context_res_man(ctx),
                                         cmd->body.shid, cmd->body.type);
                 if (!IS_ERR(res)) {
@@ -2017,6 +2022,14 @@ static int vmw_cmd_set_shader(struct vmw_private *dev_priv,
                                                             VMW_RES_DIRTY_NONE);
                         if (unlikely(ret != 0))
                                 return ret;
+
+                        ret = vmw_resource_relocation_add
+                                (sw_context, res,
+                                 vmw_ptr_diff(sw_context->buf_start,
+                                              &cmd->body.shid),
+                                 vmw_res_rel_normal);
+                        if (unlikely(ret != 0))
+                                return ret;
                 }
         }
 
@@ -2193,7 +2206,8 @@ static int vmw_cmd_dx_set_shader(struct vmw_private *dev_priv,
 
         cmd = container_of(header, typeof(*cmd), header);
 
-        if (cmd->body.type >= SVGA3D_SHADERTYPE_DX10_MAX) {
+        if (cmd->body.type >= SVGA3D_SHADERTYPE_DX10_MAX ||
+            cmd->body.type < SVGA3D_SHADERTYPE_MIN) {
                 VMW_DEBUG_USER("Illegal shader type %u.\n",
                                (unsigned int) cmd->body.type);
                 return -EINVAL;
@@ -2414,6 +2428,10 @@ static int vmw_cmd_dx_view_define(struct vmw_private *dev_priv,
                 return -EINVAL;
 
         cmd = container_of(header, typeof(*cmd), header);
+        if (unlikely(cmd->sid == SVGA3D_INVALID_ID)) {
+                VMW_DEBUG_USER("Invalid surface id.\n");
+                return -EINVAL;
+        }
         ret = vmw_cmd_res_check(dev_priv, sw_context, vmw_res_surface,
                                 VMW_RES_DIRTY_NONE, user_surface_converter,
                                 &cmd->sid, &srf);