commit 64b1cfe27c6187bef1cdb1bea571233b318c02ff
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 11 22:45:20 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 11 22:45:20 2023 +0000
tree 45a6fde26fee12600336f7f7a41de912d74b601a
parent 9176b3d7eed61e21e292889e88f9bf8e2e19899c
parent 5b527a04badf4f2aeca1b9bd7a94375a7a8aea5b

Merge "Vulkan: Avoid buffer overflow by ignoring duplicate extensions" into main

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index a99355f..f92078d 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -747,6 +747,17 @@
         if (strcmp(name, props.extensionName) != 0)
             continue;
 
+        // Ignore duplicate extensions (see: b/288929054)
+        bool duplicate_entry = false;
+        for (uint32_t j = 0; j < filter.name_count; j++) {
+            if (strcmp(name, filter.names[j]) == 0) {
+                duplicate_entry = true;
+                break;
+            }
+        }
+        if (duplicate_entry == true)
+            continue;
+
         filter.names[filter.name_count++] = name;
         if (ext_bit != ProcHook::EXTENSION_UNKNOWN) {
             if (ext_bit == ProcHook::ANDROID_native_buffer)