openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: 84937296c6

Change-Id: Ia71076213c9a6770ff35b999024b1d223c82bd77
This commit is contained in:
Bowgo Tsai 2017-07-20 01:58:05 +00:00 committed by android-build-merger
parent 5d256bc555 84937296c6
commit e5de94756b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs_mgr/fs_mgr_verity.cpp
View File

@ -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;
}