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

Commit dd42e278 authored by Calin Juravle's avatar Calin Juravle Committed by Andreas Gampe
Browse files

Adjust the validation code for secondary dex paths 

Do not validate the package path when reconciling secondary dex files. If
the file does not exist we cannot resolve the system sym links (e.g.
/data/user/0 -> /data/data) and the validation will fail leaving oat files
behind.

(cherry picked from commit 9cd45602)

Bug: 64460009
Test: adb shell cmd package reconcile-secondary-dex-files
com.google.android.googlequicksearchbox (after removing some files)
      adb shell cmd package compile -m speed --secondary-dex
com.google.android.googlequicksearchbox
      adb shell /data/nativetest64/installd_utils_test/installd_utils_test

Merged-In: I9734ad18a579d44088180326661d8cf8288e90be
Change-Id: I9734ad18a579d44088180326661d8cf8288e90be
parent e6d7ad52

cmds/installd/dexopt.cpp

+7 −1
Original line number Diff line number Diff line
@@ -1805,8 +1805,14 @@ bool reconcile_secondary_dex_file(const std::string& dex_path, 
    }



    const char* volume_uuid_cstr = volume_uuid == nullptr ? nullptr : volume_uuid->c_str();



    // Note that we cannot validate the package path here because the file might not exist

    // and we cannot call realpath to resolve system symlinks. Since /data/user/0 symlinks to

    // /data/data/ a lot of validations will fail if we attempt to check the package path.

    // It is still ok to be more relaxed because any file removal is done after forking and

    // dropping capabilities.

    if (!validate_secondary_dex_path(pkgname.c_str(), dex_path.c_str(), volume_uuid_cstr,

            uid, storage_flag)) {

            uid, storage_flag, /*validate_package_path*/ false)) {

        LOG(ERROR) << "Could not validate secondary dex path " << dex_path;

        return false;

    }

cmds/installd/utils.cpp

+13 −10
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ int validate_system_app_path(const char* path) { 
}



bool validate_secondary_dex_path(const std::string& pkgname, const std::string& dex_path,

        const char* volume_uuid, int uid, int storage_flag) {

        const char* volume_uuid, int uid, int storage_flag, bool validate_package_path) {

    CHECK(storage_flag == FLAG_STORAGE_CE || storage_flag == FLAG_STORAGE_DE);



    // Empty paths are not allowed.
@@ -821,7 +821,9 @@ bool validate_secondary_dex_path(const std::string& pkgname, const std::string& 
    // The path should be at most PKG_PATH_MAX long.

    if (dex_path.size() > PKG_PATH_MAX) { return false; }



    // The dex_path should be under the app data directory.

    if (validate_package_path) {

        // If we are asked to validate the package path check that

        // the dex_path is under the app data directory.

        std::string app_private_dir = storage_flag == FLAG_STORAGE_CE

            ? create_data_user_ce_package_path(

                    volume_uuid, multiuser_get_user_id(uid), pkgname.c_str())
@@ -831,6 +833,7 @@ bool validate_secondary_dex_path(const std::string& pkgname, const std::string& 
        if (strncmp(dex_path.c_str(), app_private_dir.c_str(), app_private_dir.size()) != 0) {

            return false;

        }

    }



    // If we got here we have a valid path.

    return true;

cmds/installd/utils.h

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void remove_path_xattr(const std::string& path, const char* inode_xattr); 


int validate_system_app_path(const char* path);

bool validate_secondary_dex_path(const std::string& pkgname, const std::string& dex_path,

        const char* volume_uuid, int uid, int storage_flag);

        const char* volume_uuid, int uid, int storage_flag, bool validate_package_path = true);



int get_path_from_env(dir_rec_t* rec, const char* var);