Backport commit 5ed7f4b5eca1 ("drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invalid read") to linux-5.1-stable
Subsystems (4)
PATCH 1/1 Backport commit 5ed7f4b5eca1 ("drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invalid read") to linux-5.1-stable
Commit 5ed7f4b5eca1 ("drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invalid read") upstream.
Commit 5ed7f4b5eca1 ("drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader() leading to an invalid read") resolved an integer underflow when SVGA_3D_CMD_DX_SET_SHADER was called with a shader ID of SVGA3D_INVALID_ID, and a shader type of SVGA3D_SHADERTYPE_INVALID.
(The original patch failed to apply cleanly in 5.1-stable as VMW_DEBUG_USER does not exist here.)
--- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +2 -1
@@ -2338,7 +2338,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 ) {DRM_ERROR ("Illegal shader type %u.\n" , (unsigned ) cmd->body.type);return -EINVAL ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerQuoted 11 lines · Murray McAllister
Commit
5ed7f4b5eca1("drm/vmwgfx: integer underflow invmw_cmd_dx_set_shader()leading to an invalid read") upstream.Commit
5ed7f4b5eca1("drm/vmwgfx: integer underflow invmw_cmd_dx_set_shader()leading to an invalid read") resolved an integer underflow whenSVGA_3D_CMD_DX_SET_SHADERwas called with a shader ID ofSVGA3D_INVALID_ID, and a shader type ofSVGA3D_SHADERTYPE_INVALID.(The original patch failed to apply cleanly in 5.1-stable as
VMW_DEBUG_USERdoes not exist here.)
What about 4.19 and 4.14?
Also, don't modify the commit message/subject, just add your backporting notes to the original commit message.
--
Thanks,
Sasha
Greg KH
maintainerQuoted 10 lines · Sasha Levin
Quoted 9 lines · Murray McAllister
Commit
5ed7f4b5eca1("drm/vmwgfx: integer underflow invmw_cmd_dx_set_shader()leading to an invalid read") upstream.Commit
5ed7f4b5eca1("drm/vmwgfx: integer underflow invmw_cmd_dx_set_shader()leading to an invalid read") resolved an integer underflow whenSVGA_3D_CMD_DX_SET_SHADERwas called with a shader ID ofSVGA3D_INVALID_ID, and a shader type ofSVGA3D_SHADERTYPE_INVALID.
Quoted 4 lines
Quoted 2 lines
(The original patch failed to apply cleanly in 5.1-stable as
VMW_DEBUG_USERdoes not exist here.)What about 4.19 and 4.14?
I already applied it everywhere (even 4.9.y and 4.4.y) :)
thanks,
greg k-h