Skip to content

Commit c59acfb

Browse files
authored
[ET-VK][ez] Fix use-after-free bug in Vulkan queue creation
Differential Revision: D89687612 Pull Request resolved: pytorch#16367
1 parent 0f5a252 commit c59acfb

1 file changed

Lines changed: 16 additions & 5 deletions

File tree

‎backends/vulkan/runtime/vk_api/Adapter.cpp‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ void find_compute_queues(
2222
const PhysicalDevice& physical_device,
2323
const uint32_t num_queues_to_create,
2424
std::vector<VkDeviceQueueCreateInfo>& queue_create_infos,
25-
std::vector<std::pair<uint32_t, uint32_t>>& queues_to_get) {
25+
std::vector<std::pair<uint32_t, uint32_t>>& queues_to_get,
26+
std::vector<std::vector<float>>& queue_priorities) {
2627
queue_create_infos.reserve(num_queues_to_create);
2728
queues_to_get.reserve(num_queues_to_create);
2829

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

39-
const std::vector<float> queue_priorities(queues_to_init, 1.0f);
40+
queue_priorities.emplace_back(queues_to_init, 1.0f);
4041
queue_create_infos.push_back({
4142
VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO, // sType
4243
nullptr, // pNext
4344
0u, // flags
4445
family_i, // queueFamilyIndex
4546
queues_to_init, // queueCount
46-
queue_priorities.data(), // pQueuePriorities
47+
queue_priorities.back().data(), // pQueuePriorities
4748
});
4849

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

9192
std::vector<VkDeviceQueueCreateInfo> queue_create_infos;
9293
std::vector<std::pair<uint32_t, uint32_t>> queues_to_get;
94+
std::vector<std::vector<float>> queue_priorities;
9395
find_compute_queues(
94-
physical_device, num_queues_to_create, queue_create_infos, queues_to_get);
96+
physical_device,
97+
num_queues_to_create,
98+
queue_create_infos,
99+
queues_to_get,
100+
queue_priorities);
95101

96102
// Create the VkDevice
97103
std::vector<const char*> requested_device_extensions{
@@ -277,8 +283,13 @@ Adapter::Adapter(
277283
owns_device_{false} {
278284
std::vector<VkDeviceQueueCreateInfo> queue_create_infos;
279285
std::vector<std::pair<uint32_t, uint32_t>> queues_to_get;
286+
std::vector<std::vector<float>> queue_priorities;
280287
find_compute_queues(
281-
physical_device_, num_queues, queue_create_infos, queues_to_get);
288+
physical_device_,
289+
num_queues,
290+
queue_create_infos,
291+
queues_to_get,
292+
queue_priorities);
282293
populate_queue_info(
283294
physical_device_, device_.handle, queues_to_get, queues_, queue_usage_);
284295
}

0 commit comments

Comments
 (0)