commit cef637a4fb112f4b8cd8e53abcbedbaca226ea36
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 02:54:08 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 20 02:54:08 2022 +0000
tree 62f65196e54f5f914f442679e23ff2113cd0b114
parent c53d859120c1ae3355533293ef72a2db341246ea
parent 68e09aa4fe3bb2448b560c30d3dc33e0982013a7

Merge cherrypicks of [17605899] into rvc-platform-release.

Change-Id: I6ff19cc9220deee8a506e9ed4e64e1e644244537

adb/client/file_sync_client.cpp

diff --git a/adb/client/file_sync_client.cpp b/adb/client/file_sync_client.cpp
index e686973..3374812 100644
--- a/adb/client/file_sync_client.cpp
+++ b/adb/client/file_sync_client.cpp
@@ -477,6 +477,17 @@
             if (!ReadFdExactly(fd, buf, len)) return false;
             buf[len] = 0;
 
+            // Address the unlikely scenario wherein a
+            // compromised device/service might be able to
+            // traverse across directories on the host. Let's
+            // shut that door!
+            if (strchr(buf, '/')
+#if defined(_WIN32)
+                || strchr(buf, '\\')
+#endif
+            ) {
+                return false;
+            }
             callback(dent.mode, dent.size, dent.mtime, buf);
         }
     }