clamp re-queried physical device count in setup_loader_term_phys_devs#1949
Merged
charles-lunarg merged 1 commit intoJun 25, 2026
Merged
Conversation
The per-ICD physical_devices scratch array is sized from the first EnumeratePhysicalDevices query, then the fill call re-uses the same device_count as the in/out parameter. The allocated size was never kept, so a driver reporting a larger count on the fill call than on the sizing call drove the consume loop past the end of the stack array. Snapshot the allocated count and clamp device_count back to it.
|
Author aizu-m not on autobuild list. Waiting for curator authorization before starting CI build. |
1 similar comment
|
Author aizu-m not on autobuild list. Waiting for curator authorization before starting CI build. |
|
CI Vulkan-Loader build queued with queue ID 18012. |
charles-lunarg
approved these changes
Jun 25, 2026
charles-lunarg
left a comment
Collaborator
There was a problem hiding this comment.
More defensive checks for bad drivers, good with me.
|
CI Vulkan-Loader build # 3591 running. |
|
CI Vulkan-Loader build # 3591 passed. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
setup_loader_term_phys_devs, the per-ICD two-call enumeration:
Walking the two calls: device_count is the same in/out variable for both, and the size handed to loader_stack_alloc is never kept. A driver that reports a larger device_count on the fill call than on the sizing call leaves the consume loop reading past the end of the stack array, and those out-of-bounds VkPhysicalDevice handles feed straight into the wrapped device list.
terminator_EnumeratePhysicalDeviceGroups already clamps its re-queried group count this way; the base vkEnumeratePhysicalDevices path was the one still trusting the second count. Snapshot the count before the fill call and clamp device_count back down to it.