tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: Id17c41d7b22f6626cdde4d6a8bb9ef5beaa1aa60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Elliott Hughes 2023-11-08 16:24:09 +00:00 committed by Automerger Merge Worker
commit 3a3a7c4dc3
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
run-as/run-as.cpp
View file

@ -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) {