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

Commit 4f8cf90d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Mark fs-verity support for /metadata if first_api_level >= R" am:... 

Merge "Mark fs-verity support for /metadata if first_api_level >= R" am: e33c0e54 am: b48b5d9b am: eb3eb18b

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

Change-Id: I8a4895bb5f7b5c85b129dc387cb41ef6acae6673
parents 033f5966 eb3eb18b

fs_mgr/fs_mgr_fstab.cpp

+10 −2
Original line number Diff line number Diff line
@@ -666,9 +666,11 @@ void TransformFstabForDsu(Fstab* fstab, const std::string& dsu_slot, 
}



void EnableMandatoryFlags(Fstab* fstab) {

    // Devices launched in R and after should enable fs_verity on userdata. The flag causes tune2fs

    // to enable the feature. A better alternative would be to enable on mkfs at the beginning.

    // Devices launched in R and after must support fs_verity. Set flag to cause tune2fs

    // to enable the feature on userdata and metadata partitions.

    if (android::base::GetIntProperty("ro.product.first_api_level", 0) >= 30) {

        // Devices launched in R and after should enable fs_verity on userdata.

        // A better alternative would be to enable on mkfs at the beginning.

        std::vector<FstabEntry*> data_entries = GetEntriesForMountPoint(fstab, "/data");

        for (auto&& entry : data_entries) {

            // Besides ext4, f2fs is also supported. But the image is already created with verity
@@ -677,6 +679,12 @@ void EnableMandatoryFlags(Fstab* fstab) { 
                entry->fs_mgr_flags.fs_verity = true;

            }

        }

        // Devices shipping with S and earlier likely do not already have fs_verity enabled via

        // mkfs, so enable it here.

        std::vector<FstabEntry*> metadata_entries = GetEntriesForMountPoint(fstab, "/metadata");

        for (auto&& entry : metadata_entries) {

            entry->fs_mgr_flags.fs_verity = true;

        }

    }

}