commit 56669dc772f36bd1360acd96ed7f33e8ab098bf0
author Chris Göllner <chrisgollner@google.com> Mon Apr 01 13:55:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 01 13:55:02 2024 +0000
tree 072c64d452b193ccfcf4e4ac6b5a2e9fffcf4427
parent e5ef5adbc733504077b87a62f5c57828983711a9
parent 5fd1f1787613db42d28886dd06038dd18bec5d35

Merge "Revert "adb: Do not use fs_config unless we are root (try 2)."" into main

daemon/file_sync_service.cpp

diff --git a/daemon/file_sync_service.cpp b/daemon/file_sync_service.cpp
index ab20e58..5891d30 100644
--- a/daemon/file_sync_service.cpp
+++ b/daemon/file_sync_service.cpp
@@ -68,6 +68,16 @@
 using android::base::Realpath;
 using android::base::StringPrintf;
 
+static bool should_use_fs_config(const std::string& path) {
+#if defined(__ANDROID__)
+    // TODO: use fs_config to configure permissions on /data too.
+    return !android::base::StartsWith(path, "/data/");
+#else
+    UNUSED(path);
+    return false;
+#endif
+}
+
 static bool update_capabilities(const char* path, uint64_t capabilities) {
 #if defined(__ANDROID__)
     if (capabilities == 0) {
@@ -109,7 +119,9 @@
         }
         partial_path += path_component;
 
-        adbd_fs_config(partial_path.c_str(), true, nullptr, &uid, &gid, &mode, &capabilities);
+        if (should_use_fs_config(partial_path)) {
+            adbd_fs_config(partial_path.c_str(), 1, nullptr, &uid, &gid, &mode, &capabilities);
+        }
         if (adb_mkdir(partial_path.c_str(), mode) == -1) {
             if (errno != EEXIST) {
                 return false;
@@ -518,8 +530,8 @@
         uid_t uid = -1;
         gid_t gid = -1;
         uint64_t capabilities = 0;
-        if (!dry_run) {
-            adbd_fs_config(path.c_str(), false, nullptr, &uid, &gid, &mode, &capabilities);
+        if (should_use_fs_config(path) && !dry_run) {
+            adbd_fs_config(path.c_str(), 0, nullptr, &uid, &gid, &mode, &capabilities);
         }
 
         result = handle_send_file(s, path.c_str(), &timestamp, uid, gid, capabilities, mode,

libs/libadbd_fs/adbd_fs.cpp

diff --git a/libs/libadbd_fs/adbd_fs.cpp b/libs/libadbd_fs/adbd_fs.cpp
index e2425ef..8e62d40 100644
--- a/libs/libadbd_fs/adbd_fs.cpp
+++ b/libs/libadbd_fs/adbd_fs.cpp
@@ -17,19 +17,14 @@
 #include <adbd_fs.h>
 
 #include <private/fs_config.h>
-#include <unistd.h>
 
 void adbd_fs_config(const char* path, int dir, const char* target_out_path, uid_t* uid, gid_t* gid,
                     mode_t* mode, uint64_t* capabilities) {
-  // Only root has the necessary permissions to be able to apply fs_config.
-  if (getuid() != 0) {
-    return;
-  }
-  struct fs_config conf;
-  if (get_fs_config(path, dir, target_out_path, &conf)) {
-    *uid = conf.uid;
-    *gid = conf.gid;
-    *mode = conf.mode;
-    *capabilities = conf.capabilities;
-  }
+  unsigned uid_hack;
+  unsigned gid_hack;
+  unsigned mode_hack;
+  fs_config(path, dir, target_out_path, &uid_hack, &gid_hack, &mode_hack, capabilities);
+  *uid = uid_hack;
+  *gid = gid_hack;
+  *mode = mode_hack;
 }

libs/libadbd_fs/include/adbd_fs.h

diff --git a/libs/libadbd_fs/include/adbd_fs.h b/libs/libadbd_fs/include/adbd_fs.h
index 1c0895c..6158d72 100644
--- a/libs/libadbd_fs/include/adbd_fs.h
+++ b/libs/libadbd_fs/include/adbd_fs.h
@@ -20,7 +20,7 @@
 #include <sys/types.h>
 
 extern "C" {
-// Thin wrapper around libcutils get_fs_config.
+// Thin wrapper around libcutils fs_config.
 void adbd_fs_config(const char* path, int dir, const char* target_out_path, uid_t* uid, gid_t* gid,
                     mode_t* mode, uint64_t* capabilities);
 }