Module: Mesa Branch: staging/22.2 Commit: 3262b3220fa8563b8193d1b9a710dbe030266504 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3262b3220fa8563b8193d1b9a710dbe030266504
Author: Mike Blumenkrantz <[email protected]> Date: Wed Aug 24 08:53:31 2022 -0400 tu: fix invalid free on alloc failure this is not an allocated pointer cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18230> (cherry picked from commit 1e7a131fd1ed6d9d1fc338f9387f032ee46a3e33) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_cs.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e941dde3cfe..c669049c558 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3793,7 +3793,7 @@ "description": "tu: fix invalid free on alloc failure", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/freedreno/vulkan/tu_cs.c b/src/freedreno/vulkan/tu_cs.c index 0d83e5a186b..28fc0f4e069 100644 --- a/src/freedreno/vulkan/tu_cs.c +++ b/src/freedreno/vulkan/tu_cs.c @@ -130,7 +130,6 @@ tu_cs_add_bo(struct tu_cs *cs, uint32_t size) tu_bo_init_new(cs->device, &new_bo, size * sizeof(uint32_t), TU_BO_ALLOC_GPU_READ_ONLY | TU_BO_ALLOC_ALLOW_DUMP); if (result != VK_SUCCESS) { - free(new_bo); return result; }
