glsl: Fix out of bounds read in shader_cache_read_program_metadata
authorKenneth Graunke <kenneth@whitecape.org>
Sat, 8 Jun 2019 06:00:40 +0000 (23:00 -0700)
committerKenneth Graunke <kenneth@whitecape.org>
Tue, 18 Jun 2019 02:22:19 +0000 (21:22 -0500)
commit3c10a2726bcf686f03e31e79e40786e3894ff063
treef0ead33ac3c5ffc06edc0583c76ccffa7aa4fa00
parent9672b7044cc329b94a72de9ec5bdda1895901304
glsl: Fix out of bounds read in shader_cache_read_program_metadata

The VaryingNames array has NumVaryings entries.  But BufferStride is
a small array of MAX_FEEDBACK_BUFFERS (4) entries.  Programs with
more than 4 varyings would read out of bounds.

Also, BufferStride is set based on the shader itself, which means that
it's inherently already included in the hash, and doesn't need to be
included again.  At the point when shader_cache_read_program_metadata
is called, the linker hasn't even set those fields yet.  So, just drop
it entirely.

Fixes valgrind errors in KHR-GL45.transform_feedback.linking_errors_test.

Fixes: 6d830940f78 glsl/shader_cache: Allow shader cache usage with transform feedback
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
src/compiler/glsl/shader_cache.cpp