summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaíra Canal <mcanal@igalia.com>2026-11-18 18:47:29 -0300
committerMaíra Canal <mcanal@igalia.com>2026-11-19 10:40:54 -0300
commit15da41dff1f66a389d238db60a1c19fa83582d07 (patch)
tree8fa11a1621fc74c5808d4580b4cd8d6ce70a59c1
parent1fbbd14add401c70c178f0fa13016a3a53ef0de5 (diff)
drm/vc4: Check for a validated shader before reading its thread mode
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: stable@vger.kernel.org Fixes: c778cc5df944 ("drm/vc4: Add fragment shader threading support") Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> Link: https://patch.msgid.link/20261118-vc4-icache-workaround-v1-2-5b8adc2c84fe@igalia.com Signed-off-by: Maíra Canal <mcanal@igalia.com>
-rw-r--r--drivers/gpu/drm/vc4/vc4_validate.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_validate.c b/drivers/gpu/drm/vc4/vc4_validate.c
index 0d2b08abf1ad..4fe7e09dfe8e 100644
--- a/drivers/gpu/drm/vc4/vc4_validate.c
+++ b/drivers/gpu/drm/vc4/vc4_validate.c
@@ -823,6 +823,9 @@ validate_gl_shader_rec(struct drm_device *dev,
bo[i] = to_drm_gem_dma_obj(exec->bo[src_handles[i]]);
if (!bo[i])
return -EINVAL;
+
+ if (!to_vc4_bo(&bo[i]->base)->validated_shader)
+ return -EINVAL;
}
for (i = shader_reloc_count; i < nr_relocs; i++) {
bo[i] = vc4_use_bo(exec, src_handles[i]);
@@ -843,7 +846,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 +862,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");