From 6f3c1c909bfea086d0e2b1d5772ef69724741674 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Fri, 6 Sep 2024 19:36:17 -0400
Subject: [PATCH] hk: don't leak GS subparts in an error path

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31532>
---
 src/asahi/vulkan/hk_shader.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/asahi/vulkan/hk_shader.c b/src/asahi/vulkan/hk_shader.c
index fa729fa2e77..c001d18389a 100644
--- a/src/asahi/vulkan/hk_shader.c
+++ b/src/asahi/vulkan/hk_shader.c
@@ -1028,7 +1028,14 @@ hk_compile_shader(struct hk_device *dev, struct vk_shader_compile_info *info,
                                        variants[v].out, sw_stage, true, NULL);
                if (result != VK_SUCCESS) {
                   hk_api_shader_destroy(&dev->vk, &obj->vk, pAllocator);
-                  ralloc_free(nir);
+                  if (clone != nir) {
+                     ralloc_free(nir);
+                  }
+
+                  ralloc_free(clone);
+                  ralloc_free(pre_gs);
+                  ralloc_free(count);
+                  ralloc_free(rast);
                   return result;
                }
             }