Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85094d8d authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "run-as: reduce the scope of changed egid." into main am: 1b86c0dd 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2820457



Change-Id: Iaf3420bc671cc72b84dfda2e5ae70a34514f3b58
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d42fcd60 1b86c0dd

run-as/run-as.cpp

+2 −4
Original line number Diff line number Diff line
@@ -191,14 +191,13 @@ int main(int argc, char* argv[]) { 
  }



  // Retrieve package information from system, switching egid so we can read the file.

  pkg_info info = {.name = pkgname};

  gid_t old_egid = getegid();

  if (setegid(AID_PACKAGE_INFO) == -1) error(1, errno, "setegid(AID_PACKAGE_INFO) failed");

  pkg_info info;

  memset(&info, 0, sizeof(info));

  info.name = pkgname;

  if (!packagelist_parse(packagelist_parse_callback, &info)) {

    error(1, errno, "packagelist_parse failed");

  }

  if (setegid(old_egid) == -1) error(1, errno, "couldn't restore egid");



  // Handle a multi-user data path

  if (userId > 0) {
@@ -211,7 +210,6 @@ int main(int argc, char* argv[]) { 
  if (info.uid == 0) {

    error(1, 0, "unknown package: %s", pkgname);

  }

  if (setegid(old_egid) == -1) error(1, errno, "couldn't restore egid");



  // Verify that user id is not too big.

  if ((UID_MAX - info.uid) / AID_USER_OFFSET < (uid_t)userId) {