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

Commit 15792fd5 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by android-build-merger
Browse files

Merge "Use _exit for profile copy dexopt command" into oc-dr1-dev am: de65cb8e 

am: d4f8de92

Change-Id: I8e8194f88b895d15955316377c801611407c1f68
parents 65404a0c d4f8de92

cmds/installd/dexopt.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -863,6 +863,8 @@ bool copy_system_profile(const std::string& system_profile, 
        return false;

        return false;

    }

    }





    // As a security measure we want to write the profile information with the reduced capabilities

    // of the package user id. So we fork and drop capabilities in the child.

    pid_t pid = fork();

    pid_t pid = fork();

    if (pid == 0) {

    if (pid == 0) {

        /* child -- drop privileges before continuing */

        /* child -- drop privileges before continuing */
@@ -900,7 +902,9 @@ bool copy_system_profile(const std::string& system_profile, 
        if (flock(out_fd.get(), LOCK_UN) != 0) {

        if (flock(out_fd.get(), LOCK_UN) != 0) {

            PLOG(WARNING) << "Error unlocking profile " << data_profile_location;

            PLOG(WARNING) << "Error unlocking profile " << data_profile_location;

        }

        }

        exit(0);

        // Use _exit since we don't want to run the global destructors in the child.

        // b/62597429

        _exit(0);

    }

    }

    /* parent */

    /* parent */

    int return_code = wait_child(pid);

    int return_code = wait_child(pid);