Skip to content

[ET-VK][ez] Fix use-after-free bug in Vulkan queue creation #16367

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
meta-codesync merged 1 commit into from
Dec 23, 2025
+16 −5
Merged

[ET-VK][ez] Fix use-after-free bug in Vulkan queue creation #16367

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
21 changes: 16 additions & 5 deletions backends/vulkan/runtime/vk_api/Adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ void find_compute_queues(
const PhysicalDevice& physical_device,
const uint32_t num_queues_to_create,
std::vector<VkDeviceQueueCreateInfo>& queue_create_infos,
std::vector<std::pair<uint32_t, uint32_t>>& queues_to_get) {
std::vector<std::pair<uint32_t, uint32_t>>& queues_to_get,
std::vector<std::vector<float>>& queue_priorities) {
queue_create_infos.reserve(num_queues_to_create);
queues_to_get.reserve(num_queues_to_create);

Expand All @@ -36,14 +37,14 @@ void find_compute_queues(
const uint32_t queues_to_init =
std::min(remaining_queues, queue_properties.queueCount);

const std::vector<float> queue_priorities(queues_to_init, 1.0f);
queue_priorities.emplace_back(queues_to_init, 1.0f);
queue_create_infos.push_back({
VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
family_i, // queueFamilyIndex
queues_to_init, // queueCount
queue_priorities.data(), // pQueuePriorities
queue_priorities.back().data(), // pQueuePriorities
});

for (size_t queue_i = 0; queue_i < queues_to_init; ++queue_i) {
Expand Down Expand Up @@ -90,8 +91,13 @@ VkDevice create_logical_device(

std::vector<VkDeviceQueueCreateInfo> queue_create_infos;
std::vector<std::pair<uint32_t, uint32_t>> queues_to_get;
std::vector<std::vector<float>> queue_priorities;
find_compute_queues(
physical_device, num_queues_to_create, queue_create_infos, queues_to_get);
physical_device,
num_queues_to_create,
queue_create_infos,
queues_to_get,
queue_priorities);

// Create the VkDevice
std::vector<const char*> requested_device_extensions{
Expand Down Expand Up @@ -277,8 +283,13 @@ Adapter::Adapter(
owns_device_{false} {
std::vector<VkDeviceQueueCreateInfo> queue_create_infos;
std::vector<std::pair<uint32_t, uint32_t>> queues_to_get;
std::vector<std::vector<float>> queue_priorities;
find_compute_queues(
physical_device_, num_queues, queue_create_infos, queues_to_get);
physical_device_,
num_queues,
queue_create_infos,
queues_to_get,
queue_priorities);
populate_queue_info(
physical_device_, device_.handle, queues_to_get, queues_, queue_usage_);
}
Expand Down
Loading