fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 20:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

vulkan/wsi: check if image info was already freed

Browse source 
We set the different data being freed to NULL after freeing it, and
checks for NULL before freeing it.

This fixes several double free crash with v3dv, when running OOM wsi
tests, like for example:
dEQP-VK.wsi.xlib.swapchain.simulate_oom.composite_alpha

Although note that only one person got those on a new fresh install of
the Raspbian OS, so this problem was rare.

Fixes: 5b13d74583 ("vulkan/wsi/drm: Break create_native_image in pieces")
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20695>
(cherry picked from commit b27e42dcb5)
This commit is contained in:
Alejandro Piñeiro 2023-01-13 13:42:26 +01:00 • committed by Eric Engestrom
parent 893910b353
commit 116b1de2aa
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -4999,7 +4999,7 @@
"description": "vulkan/wsi: check if image info was already freed",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "5b13d74583513ddd029e30c989838b96993545a0"
},

20
src/vulkan/wsi/wsi_common.c
View file

@ -578,10 +578,22 @@ void
wsi_destroy_image_info(const struct wsi_swapchain *chain,
struct wsi_image_info *info)
{
vk_free(&chain->alloc, (void *)info->create.pQueueFamilyIndices);
vk_free(&chain->alloc, (void *)info->format_list.pViewFormats);
vk_free(&chain->alloc, (void *)info->drm_mod_list.pDrmFormatModifiers);
vk_free(&chain->alloc, info->modifier_props);
if (info->create.pQueueFamilyIndices != NULL) {
vk_free(&chain->alloc, (void *)info->create.pQueueFamilyIndices);
info->create.pQueueFamilyIndices = NULL;
}
if (info->format_list.pViewFormats != NULL) {
vk_free(&chain->alloc, (void *)info->format_list.pViewFormats);
info->format_list.pViewFormats = NULL;
}
if (info->drm_mod_list.pDrmFormatModifiers != NULL) {
vk_free(&chain->alloc, (void *)info->drm_mod_list.pDrmFormatModifiers);
info->drm_mod_list.pDrmFormatModifiers = NULL;
}
if (info->modifier_props != NULL) {
vk_free(&chain->alloc, info->modifier_props);
info->modifier_props = NULL;
}
}
VkResult