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

Commit 63b22a3e authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

Merge "fs_mgr: allow disable dm-verity when the device is unlocked without metadata" 

am: 17c84b2c

Change-Id: I4e0e5ed112cb8d8abd0ee666e1c4d903713c9bbd
parents 68741efb 17c84b2c

fs_mgr/fs_mgr_verity.cpp

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <unistd.h>



#include <android-base/file.h>

#include <android-base/properties.h>

#include <android-base/strings.h>

#include <android-base/unique_fd.h>

#include <crypto_utils/android_pubkey.h>
@@ -874,6 +875,11 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab, bool wait_for_verity_dev) 
    // read verity metadata

    if (fec_verity_get_metadata(f, &verity) < 0) {

        PERROR << "Failed to get verity metadata '" << fstab->blk_device << "'";

        // Allow verity disabled when the device is unlocked without metadata

        if ("0" == android::base::GetProperty("ro.boot.flash.locked", "")) {

            retval = FS_MGR_SETUP_VERITY_DISABLED;

            LWARNING << "Allow invalid metadata when the device is unlocked";

        }

        goto out;

    }