Mesa (master): nir_to_tgsi: Fix buffer overflow in atomic image compswap.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Jan 25 19:20:56 UTC 2021


Module: Mesa
Branch: master
Commit: fb25ef153a0aa7c30b4106fc1f982a886b870fca
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb25ef153a0aa7c30b4106fc1f982a886b870fca

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jan 14 12:53:57 2021 -0800

nir_to_tgsi: Fix buffer overflow in atomic image compswap.

Caught by the new asan CI job.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8530>

---

 src/gallium/auxiliary/nir/nir_to_tgsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi.c b/src/gallium/auxiliary/nir/nir_to_tgsi.c
index a6147252c04..0271dbd530f 100644
--- a/src/gallium/auxiliary/nir/nir_to_tgsi.c
+++ b/src/gallium/auxiliary/nir/nir_to_tgsi.c
@@ -1371,7 +1371,7 @@ static void
 ntt_emit_image_load_store(struct ntt_compile *c, nir_intrinsic_instr *instr)
 {
    unsigned op;
-   struct ureg_src srcs[3];
+   struct ureg_src srcs[4];
    int num_src = 0;
    enum glsl_sampler_dim dim = nir_intrinsic_image_dim(instr);
    bool is_array = nir_intrinsic_image_array(instr);



More information about the mesa-commit mailing list