Skip to content

Fix invalid iteration of empty override path #1766

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
Aug 27, 2025
Merged

Fix invalid iteration of empty override path #1766

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions loader/loader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4250,9 +4250,13 @@ VkResult get_override_layer_override_paths(struct loader_instance *inst, struct
for (uint32_t j = 0; j < prop->override_paths.count; j++) {
copy_data_file_info(prop->override_paths.list[j], NULL, 0, &cur_write_ptr);
}

// Subtract one from cur_write_ptr only if something was written so we can set the null terminator
if (*override_paths < cur_write_ptr) {
--cur_write_ptr;
assert(cur_write_ptr - (*override_paths) < (ptrdiff_t)override_path_size);
}
// Remove the last path separator
--cur_write_ptr;
assert(cur_write_ptr - (*override_paths) < (ptrdiff_t)override_path_size);
*cur_write_ptr = '\0';
loader_log(inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_LAYER_BIT, 0, "Override layer has override paths set to %s",
*override_paths);
Expand Down
Binary file added ...ized_test_cases/clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6740380288876544
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions tests/loader_fuzz_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ TEST(BadJsonInput, ClusterFuzzTestCase_6465902356791296) {
// Causes an integer overflow - instance_enumerate_fuzzer: Integer-overflow in parse_value
execute_instance_enumerate_fuzzer("clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6465902356791296");
}
TEST(BadJsonInput, ClusterFuzzTestCase_6740380288876544) {
// Does crash with ASAN
execute_instance_enumerate_fuzzer("clusterfuzz-testcase-minimized-instance_enumerate_fuzzer-6740380288876544");
}
TEST(BadJsonInput, ClusterFuzzTestCase_4512865114259456) {
// Does crash with UBSAN and ASAN
// malloc(): invalid size (unsorted)
Expand Down
Loading