commit 60ffcfe6a98db7a1b3e1e3f6a001234e9a0ab071
author Marek Olšák <marek.olsak@amd.com> Mon Nov 09 16:20:13 2020 -0500
committer Dylan Baker <dylan.c.baker@intel.com> Fri Nov 13 10:05:34 2020 -0800
tree 0461405a99aa5eb0751a7186e74e958cf5893b28
parent 46c08b73dea5c12f8fd7e3f2a404daf110d5df43

st/mesa: fix use-after-free when updating shader info in st_link_nir

Fixes: 549ae5f8 "st/mesa: make sure prog->info is up to date for NIR (v2)"

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3756
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3685

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7516>
(cherry picked from commit 0d007349f910970ac14b20415fe76a84fd0f8fd5)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 5b35ac1..34ecce0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1327,7 +1327,7 @@
         "description": "st/mesa: fix use-after-free when updating shader info in st_link_nir",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "549ae5f84375dfadb86cfd465f0103acfae3249f"
     },

src/mesa/state_tracker/st_glsl_to_nir.cpp

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 8c835e5..d483d52 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -834,6 +834,8 @@
        */
       shader_info old_info = prog->info;
       prog->info = prog->nir->info;
+      prog->info.name = old_info.name;
+      prog->info.label = old_info.label;
       prog->info.num_ssbos = old_info.num_ssbos;
       prog->info.num_ubos = old_info.num_ubos;
       prog->info.num_abos = old_info.num_abos;