From eaa547f6f2193e50ffd5564e1f143ca42defaef8 Mon Sep 17 00:00:00 2001
From: Mel Henning <mhenning@darkrefraction.com>
Date: Tue, 2 Sep 2025 16:14:07 -0400
Subject: [PATCH] nvk: Clear cond_render_gart_* in reset_cmd_buffer

nvk_cmd_pool_free_gart_mem_list frees this buffer, so we need to clear
the pointers to it in order to avoid a use after free.

Fixes: 07c70c77de ("nvk: add cond render upload buffer.")
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Reviewed-by: Mary Guillemard <mary@mary.zone>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37153>
---
 src/nouveau/vulkan/nvk_cmd_buffer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c
index 76a03dd2a39..a3f7a720378 100644
--- a/src/nouveau/vulkan/nvk_cmd_buffer.c
+++ b/src/nouveau/vulkan/nvk_cmd_buffer.c
@@ -121,6 +121,8 @@ nvk_reset_cmd_buffer(struct vk_command_buffer *vk_cmd_buffer,
    cmd->push_mem = NULL;
    cmd->push_mem_limit = NULL;
    cmd->push = (struct nv_push) {0};
+   cmd->cond_render_gart_mem = NULL;
+   cmd->cond_render_gart_offset = 0;
 
    util_dynarray_clear(&cmd->pushes);