From: Rhys Perry <pendingchaos02@gmail.com>
Date: Tue, 24 Sep 2019 16:21:51 +0000 (+0100)
Subject: aco: fix uninitialized data in the binary
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bbac52873f4248c2f545f12137bd24071a8043cc;p=mesa.git

aco: fix uninitialized data in the binary

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-By: Timur Kristóf <timur.kristof@gmail.com>
Fixes: 93c8ebfa780 ('aco: Initial commit of independent AMD compiler')
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3081>
---

diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp
index 802adcefb1b..f951c4fdc5f 100644
--- a/src/amd/compiler/aco_interface.cpp
+++ b/src/amd/compiler/aco_interface.cpp
@@ -154,7 +154,11 @@ void aco_compile_shader(unsigned shader_count,
    }
 
    size += code.size() * sizeof(uint32_t) + sizeof(radv_shader_binary_legacy);
-   radv_shader_binary_legacy* legacy_binary = (radv_shader_binary_legacy*) malloc(size);
+   /* We need to calloc to prevent unintialized data because this will be used
+    * directly for the disk cache. Uninitialized data can appear because of
+    * padding in the struct or because legacy_binary->data can be at an offset
+    * from the start less than sizeof(radv_shader_binary_legacy). */
+   radv_shader_binary_legacy* legacy_binary = (radv_shader_binary_legacy*) calloc(size, 1);
 
    legacy_binary->base.type = RADV_BINARY_TYPE_LEGACY;
    legacy_binary->base.stage = shaders[shader_count-1]->info.stage;