validate_gl_shader_rec() reads the thread mode from the validated_shader
of the FS, VS and CS BOs before checking it for NULL. A shader record
pointing at a BO not created by DRM_IOCTL_VC4_CREATE_SHADER_BO has no
validated_shader, so userspace can trigger a NULL pointer dereference.

Check that every shader BO has a validated shader before using it.

Cc: [email protected]
Fixes: c778cc5df944 ("drm/vc4: Add fragment shader threading support")
Signed-off-by: Maíra Canal <[email protected]>
---
 drivers/gpu/drm/vc4/vc4_validate.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/vc4/vc4_validate.c 
b/drivers/gpu/drm/vc4/vc4_validate.c
index 0d2b08abf1ad..240786e7dcd5 100644
--- a/drivers/gpu/drm/vc4/vc4_validate.c
+++ b/drivers/gpu/drm/vc4/vc4_validate.c
@@ -830,6 +830,11 @@ validate_gl_shader_rec(struct drm_device *dev,
                        return -EINVAL;
        }
 
+       for (i = 0; i < shader_reloc_count; i++) {
+               if (!to_vc4_bo(&bo[i]->base)->validated_shader)
+                       return -EINVAL;
+       }
+
        if (((*(uint16_t *)pkt_u & VC4_SHADER_FLAG_FS_SINGLE_THREAD) == 0) !=
            to_vc4_bo(&bo[0]->base)->validated_shader->is_threaded) {
                DRM_DEBUG("Thread mode of CL and FS do not match\n");
@@ -843,7 +848,8 @@ validate_gl_shader_rec(struct drm_device *dev,
        }
 
        for (i = 0; i < shader_reloc_count; i++) {
-               struct vc4_validated_shader_info *validated_shader;
+               struct vc4_validated_shader_info *validated_shader =
+                       to_vc4_bo(&bo[i]->base)->validated_shader;
                uint32_t o = shader_reloc_offsets[i];
                uint32_t src_offset = *(uint32_t *)(pkt_u + o);
                uint32_t *texture_handles_u;
@@ -858,10 +864,6 @@ validate_gl_shader_rec(struct drm_device *dev,
                        return -EINVAL;
                }
 
-               validated_shader = to_vc4_bo(&bo[i]->base)->validated_shader;
-               if (!validated_shader)
-                       return -EINVAL;
-
                if (validated_shader->uniforms_src_size >
                    exec->uniforms_size) {
                        DRM_DEBUG("Uniforms src buffer overflow\n");

-- 
2.56.0

Reply via email to