Skip to content

clamp re-queried physical device count in setup_loader_term_phys_devs #1949

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
charles-lunarg merged 1 commit into from
Jun 25, 2026
+4 −0
Merged

clamp re-queried physical device count in setup_loader_term_phys_devs #1949

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
4 changes: 4 additions & 0 deletions loader/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6802,6 +6802,7 @@ VkResult setup_loader_term_phys_devs(struct loader_instance *inst) {
goto out;
}

uint32_t allocated_count = icd_phys_dev_array[icd_idx].device_count;
res = icd_term->dispatch.EnumeratePhysicalDevices(icd_term->instance, &(icd_phys_dev_array[icd_idx].device_count),
icd_phys_dev_array[icd_idx].physical_devices);
if (VK_ERROR_OUT_OF_HOST_MEMORY == res) {
Expand All @@ -6818,6 +6819,9 @@ VkResult setup_loader_term_phys_devs(struct loader_instance *inst) {
icd_term->scanned_icd->lib_name, res);
icd_phys_dev_array[icd_idx].device_count = 0;
icd_phys_dev_array[icd_idx].physical_devices = 0;
} else if (icd_phys_dev_array[icd_idx].device_count > allocated_count) {
// The fill call sizes the array, but never read past what we actually allocated.
icd_phys_dev_array[icd_idx].device_count = allocated_count;
}
} else {
loader_log(inst, VULKAN_LOADER_ERROR_BIT, 0,
Expand Down
Loading