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

Commit 4be16dcc authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Handle invalid shared GIDs." am: 788bdeae 

am: 477601a9

Change-Id: Id21818687508092e41a970b9cd18ddbe15b7d740
parents c148af22 477601a9

cmds/installd/InstalldNativeService.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -322,8 +322,8 @@ binder::Status InstalldNativeService::createAppData(const std::unique_ptr<std::s 
            const std::string ref_profile_path = create_data_ref_profile_package_path(pkgname);

            const std::string ref_profile_path = create_data_ref_profile_package_path(pkgname);

            // dex2oat/profman runs under the shared app gid and it needs to read/write reference

            // dex2oat/profman runs under the shared app gid and it needs to read/write reference

            // profiles.

            // profiles.

            appid_t shared_app_gid = multiuser_get_shared_app_gid(uid);

            int shared_app_gid = multiuser_get_shared_app_gid(uid);

            if (fs_prepare_dir_strict(

            if ((shared_app_gid != -1) && fs_prepare_dir_strict(

                    ref_profile_path.c_str(), 0700, shared_app_gid, shared_app_gid) != 0) {

                    ref_profile_path.c_str(), 0700, shared_app_gid, shared_app_gid) != 0) {

                return error("Failed to prepare " + ref_profile_path);

                return error("Failed to prepare " + ref_profile_path);

            }

            }