]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/vmwgfx: Fix an error return check in vmw_compat_shader_add()
authorHaoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
Wed, 24 Dec 2025 09:11:05 +0000 (17:11 +0800)
committerZack Rusin <zack.rusin@broadcom.com>
Wed, 7 Jan 2026 16:58:31 +0000 (11:58 -0500)
In vmw_compat_shader_add(), the return value check of vmw_shader_alloc()
is not proper. Modify the check for the return pointer 'res'.

Found by code review and compiled on ubuntu 20.04.

Fixes: 18e4a4669c50 ("drm/vmwgfx: Fix compat shader namespace")
Cc: stable@vger.kernel.org
Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
Link: https://patch.msgid.link/20251224091105.1569464-1-lihaoxiang@isrc.iscas.ac.cn
drivers/gpu/drm/vmwgfx/vmwgfx_shader.c

index 69dfe69ce0f87d8d9236b24d712512a37988f030..a8c8c9375d2973ce5b9d450bb64b0da382bf7502 100644 (file)
@@ -923,8 +923,10 @@ int vmw_compat_shader_add(struct vmw_private *dev_priv,
        ttm_bo_unreserve(&buf->tbo);
 
        res = vmw_shader_alloc(dev_priv, buf, size, 0, shader_type);
-       if (unlikely(ret != 0))
+       if (IS_ERR(res)) {
+               ret = PTR_ERR(res);
                goto no_reserve;
+       }
 
        ret = vmw_cmdbuf_res_add(man, vmw_cmdbuf_res_shader,
                                 vmw_shader_key(user_key, shader_type),