ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: e5de94756b

Change-Id: Iedca76aea1c93320bbba29bcd013d1cd331380de
This commit is contained in:
Bowgo Tsai 2017-07-20 02:01:05 +00:00 • committed by android-build-merger
commit 2e19aa92ed
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;
}