commit ad3bdaf7909607fe83cdce78be0512bfca148fe3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Aug 14 20:20:05 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 14 20:20:05 2023 +0000
tree a862bdc5af8e3876b87041a9a1f1b219ecef0a10
parent ebd5ab192a9d14ab7dddb9ae7249c58818c180f8
parent 1700661aa220a6cd42ad1a563b58f731789ecd91

Merge "Vulkan: Avoid buffer overflow by ignoring duplicate extensions" into udc-qpr-dev am: 1700661aa2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24392472

Change-Id: I6c1841e31896563e636a98f4435a1925c7d64b0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index d21deef..bdba27e 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -763,6 +763,17 @@
             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)