Skip to content

Fix use-after-free of dispatch table #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solidpixel merged 1 commit into from
Jul 25, 2025
Merged

Fix use-after-free of dispatch table #136

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions source_common/framework/manual_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,13 +751,15 @@ VKAPI_ATTR void VKAPI_CALL layer_vkDestroyInstance_default(VkInstance instance,
std::unique_lock<std::mutex> lock {g_vulkanLock};
auto* layer = Instance::retrieve(instance);

// Layer proxy must be destroyed before the driver version
// so we can clean up any layer-owned resources
// Save the driver function to avoid a use-after free when proxy is destroyed
auto destroyInstance = layer->driver.vkDestroyInstance;

// Layer proxy must be destroyed before the driver object as we use its dispatchable handle
Instance::destroy(layer);

// Release the lock to call into the driver
lock.unlock();
layer->driver.vkDestroyInstance(instance, pAllocator);
destroyInstance(instance, pAllocator);
}

/* See Vulkan API for documentation. */
Expand Down Expand Up @@ -839,13 +841,15 @@ VKAPI_ATTR void VKAPI_CALL layer_vkDestroyDevice_default(VkDevice device, const
std::unique_lock<std::mutex> lock {g_vulkanLock};
auto* layer = Device::retrieve(device);

// Layer proxy must be destroyed before the driver version
// so we can clean up any layer-owned resources
// Save the driver function to avoid a use-after free when proxy is destroyed
auto destroyDevice = layer->driver.vkDestroyDevice;

// Layer proxy must be destroyed before the driver object as we use its dispatchable handle
Device::destroy(layer);

// Release the lock to call into the driver
lock.unlock();
layer->driver.vkDestroyDevice(device, pAllocator);
destroyDevice(device, pAllocator);
}

/* See Vulkan API for documentation. */
Expand Down