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

Commit 2e774b01 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

Merge "fs_mgr_verity: allow verification error when the device is unlocked"... 

Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f6336 am: 84937296 am: e5de9475
am: 2e19aa92

Change-Id: If3779eceac8084723c101a6f7fa9091c4f09128e
parents 1bd7187f 2e19aa92

fs_mgr/fs_mgr_verity.cpp

+7 −1
Original line number Diff line number Diff line
@@ -841,9 +841,15 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab, bool wait_for_verity_dev) 


    // verify the signature on the table

    if (verify_verity_signature(verity) < 0) {

        // Allow signature verification error when the device is unlocked

        if (fs_mgr_is_device_unlocked()) {

            retval = FS_MGR_SETUP_VERITY_SKIPPED;

            LWARNING << "Allow signature verification error when the device is unlocked";

            goto out;

        }

        if (params.mode == VERITY_MODE_LOGGING) {

            // the user has been warned, allow mounting without dm-verity

            retval = FS_MGR_SETUP_VERITY_SUCCESS;

            retval = FS_MGR_SETUP_VERITY_SKIPPED;

            goto out;

        }