[09/11] panfrost: Fix two uninitialized accesses in compiler

Submitted by Tomeu Vizoso on May 9, 2019, 6:35 a.m.

Details

Message ID 20190509063511.62982-10-tomeu.vizoso@collabora.com
State New
Headers show
Series "panfrost: ci: RK3288 support and misc robustness" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Tomeu Vizoso May 9, 2019, 6:35 a.m.
Valgrind was complaining of those.

NIR_PASS only sets progress to TRUE if there was progress.

nir_const_load_to_arr() only sets as many constants as components has
the instruction.

This was causing some dEQP tests to flip-flop, such as:

dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_src_color_constant_color

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 src/gallium/drivers/panfrost/midgard/midgard_compile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/gallium/drivers/panfrost/midgard/midgard_compile.c b/src/gallium/drivers/panfrost/midgard/midgard_compile.c
index 9c7928decf67..25316cab053c 100644
--- a/src/gallium/drivers/panfrost/midgard/midgard_compile.c
+++ b/src/gallium/drivers/panfrost/midgard/midgard_compile.c
@@ -915,7 +915,7 @@  optimise_nir(nir_shader *nir)
                 NIR_PASS(progress, nir, nir_opt_constant_folding);
 
                 if (lower_flrp != 0) {
-                        bool lower_flrp_progress;
+                        bool lower_flrp_progress = false;
                         NIR_PASS(lower_flrp_progress,
                                  nir,
                                  nir_lower_flrp,
@@ -1020,7 +1020,7 @@  emit_load_const(compiler_context *ctx, nir_load_const_instr *instr)
 {
         nir_ssa_def def = instr->def;
 
-        float *v = ralloc_array(NULL, float, 4);
+        float *v = rzalloc_array(NULL, float, 4);
         nir_const_load_to_arr(v, instr, f32);
         _mesa_hash_table_u64_insert(ctx->ssa_constants, def.index + 1, v);
 }

Comments

On Thu, 9 May 2019 at 07:35, Tomeu Vizoso <tomeu.vizoso@collabora.com> wrote:
>
> Valgrind was complaining of those.
>
> NIR_PASS only sets progress to TRUE if there was progress.
>
> nir_const_load_to_arr() only sets as many constants as components has
> the instruction.
>
> This was causing some dEQP tests to flip-flop, such as:
>
> dEQP-GLES2.functional.fragment_ops.blend.equation_src_func_dst_func.add_src_color_constant_color
>
Please add a Fixes tag or a cc: mesa-stable@ one at least. This way
we'll pick this fix for stable.

-Emil