commit 58425e6b71927534363a1dfbebdc27ec094e9103
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 06 01:17:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 06 01:17:37 2018 +0000
tree d529aacda101da92ee65eef543e7a55a884330d5
parent 87319a17092466b5493ac1c432dc100ecbfe9e7e
parent cfac8f5c9ac6b4b679c25c0f88ecf54ae7a5af66

Merge "Fix run-as for non-owner users"

run-as/run-as.cpp

diff --git a/run-as/run-as.cpp b/run-as/run-as.cpp
index d005ecf..ac470d4 100644
--- a/run-as/run-as.cpp
+++ b/run-as/run-as.cpp
@@ -167,6 +167,15 @@
   if (!packagelist_parse(packagelist_parse_callback, &info)) {
     error(1, errno, "packagelist_parse failed");
   }
+
+  // Handle a multi-user data path
+  if (userId > 0) {
+    free(info.data_dir);
+    if (asprintf(&info.data_dir, "/data/user/%d/%s", userId, pkgname) == -1) {
+      error(1, errno, "asprintf failed");
+    }
+  }
+
   if (info.uid == 0) {
     error(1, 0, "unknown package: %s", pkgname);
   }