commit e26e603c41cc501b11622e8bf9ac8312532befc0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 23:29:10 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Apr 08 23:29:10 2022 +0000
tree bbab4c60939b92a05ff01a5ba2b3f3765d3eea3d
parent b7e3d9579894fc134bea1ab62428990339fa0ca2
parent 350352bcb7483f42f50ff439952ed02f5a79a509

Merge cherrypicks of [17585758] into security-aosp-qt-release.

Change-Id: I60ffa81746e98da9b906686adf6c6761d214a774

adb/client/file_sync_client.cpp

diff --git a/adb/client/file_sync_client.cpp b/adb/client/file_sync_client.cpp
index 5d10238..9b59096 100644
--- a/adb/client/file_sync_client.cpp
+++ b/adb/client/file_sync_client.cpp
@@ -629,6 +629,18 @@
         if (!ReadFdExactly(sc.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;
+        }
+
         func(msg.dent.mode, msg.dent.size, msg.dent.time, buf);
     }
 }