From 90e02db9a13527cc5c64d83201614181cc95c131 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Wed, 8 Apr 2020 13:35:34 -0400 Subject: [PATCH] pan/bi: Fix nondeterministic register packing Uninitialized read. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bi_pack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c index 519bc713041..ae2a6df30f2 100644 --- a/src/panfrost/bifrost/bi_pack.c +++ b/src/panfrost/bifrost/bi_pack.c @@ -353,7 +353,7 @@ static uint64_t bi_pack_registers(struct bi_registers regs) { enum bifrost_reg_control ctrl = bi_pack_register_ctrl(regs); - struct bifrost_regs s; + struct bifrost_regs s = { 0 }; uint64_t packed = 0; if (regs.enabled[1]) { @@ -375,6 +375,7 @@ bi_pack_registers(struct bi_registers regs) s.reg0 = regs.port[0]; } else { /* Port 1 disabled, so set to zero and use port 1 for ctrl */ + s.ctrl = 0; s.reg1 = ctrl << 2; if (regs.enabled[0]) { -- 2.30.2