[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <03eb2b3900505c7aba39846b533abb04f9e5682c.camel@vmware.com>
Date: Mon, 20 May 2019 13:50:03 +0000
From: Thomas Hellstrom <thellstrom@...are.com>
To: "murray.mcallister@...il.com" <murray.mcallister@...il.com>
CC: "daniel@...ll.ch" <daniel@...ll.ch>,
Linux-graphics-maintainer <Linux-graphics-maintainer@...are.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
"airlied@...ux.ie" <airlied@...ux.ie>
Subject: Re: [PATCH] drm/vmwgfx: integer underflow in vmw_cmd_dx_set_shader()
leading to an invalid read
Thanks, Murray,
I'll include in the next vmwgfx-fixes pull request.
On Mon, 2019-05-20 at 21:57 +1200, Murray McAllister wrote:
> If SVGA_3D_CMD_DX_SET_SHADER is called with a shader ID
> of SVGA3D_INVALID_ID, and a shader type of
> SVGA3D_SHADERTYPE_INVALID, the calculated binding.shader_slot
> will be 4294967295, leading to an out-of-bounds read in
> vmw_binding_loc()
> when the offset is calculated.
>
> Signed-off-by: Murray McAllister <murray.mcallister@...il.com>
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
> b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
> index 2ff7ba04d8c8..9aeb5448cfc1 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
> @@ -2193,7 +2193,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;
Powered by blists - more mailing lists