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

Commit dc516720 authored by Oli Lan's avatar Oli Lan
Browse files

Change ownership of apex data directories to root. 

The apex data directories must be accessed by apexd in order for it to
perform snapshot and restore as part of the rollback process. As apexd
runs as root, this CL changes the apex data directories under /data/misc
to be owned by root.

Bug: 141148175
Test: Build and flash; check permissions are set correctly.

Change-Id: Ib534e705802c06900884a15f39fee257d4987f4c
parent 24ccfc24

init/builtins.cpp

+2 −3
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <fscrypt/fscrypt.h>

#include <libgsi/libgsi.h>

#include <logwrap/logwrap.h>

#include <private/android_filesystem_config.h>

#include <selinux/android.h>

#include <selinux/label.h>

#include <selinux/selinux.h>
@@ -1266,9 +1267,7 @@ static Result<void> create_apex_data_dirs() { 
        if (strchr(name, '@') != nullptr) continue;



        auto path = "/data/misc/apexdata/" + std::string(name);

        auto system_uid = DecodeUid("system");

        auto options =

                MkdirOptions{path, 0700, *system_uid, *system_uid, FscryptAction::kNone, "ref"};

        auto options = MkdirOptions{path, 0770, AID_ROOT, AID_SYSTEM, FscryptAction::kNone, "ref"};

        make_dir_with_options(options);

    }

    return {};