AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alejandro Piñeiro
2023-01-13 13:42:26 +01:00
committed by Marge Bot
parent 6b8dab7de2
commit b27e42dcb5
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vulkan/wsi/wsi_common.c
+16 -4
View File
@@ -641,10 +641,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