From 032ed1f999c052627e8cfd1910c436ed5afaf7b6 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Tue, 4 Jul 2023 14:44:49 -0700 Subject: [PATCH] venus: fix a cmd tmp storage leak When the pool is destroyed, cmds are implicitly freed. Cmd level allocs have to be cleaned up to avoid leak. Cc: mesa-stable Signed-off-by: Yiwei Zhang Part-of: (cherry picked from commit ee3f17ca7909412fc9ce1288324edea3bc2e312a) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_command_buffer.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index cff08c52b71..0279e16e198 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3064,7 +3064,7 @@ "description": "venus: fix a cmd tmp storage leak", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/virtio/vulkan/vn_command_buffer.c b/src/virtio/vulkan/vn_command_buffer.c index 428d78de02a..e7844e28d71 100644 --- a/src/virtio/vulkan/vn_command_buffer.c +++ b/src/virtio/vulkan/vn_command_buffer.c @@ -638,6 +638,10 @@ vn_DestroyCommandPool(VkDevice device, &pool->command_buffers, head) { vn_cs_encoder_fini(&cmd->cs); vn_object_base_fini(&cmd->base); + + if (cmd->builder.tmp.data) + vk_free(&cmd->allocator, cmd->builder.tmp.data); + vk_free(alloc, cmd); }