tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use the blk_device supplied by vdc encryptFstab" am: 3b3a13a81a am: eeb005eb7d

Browse source 
Change-Id: I830e0e44c0d54d5b89e1dab0ab51192261746556
This commit is contained in:
Automerger Merge Worker 2020-03-05 16:32:43 +00:00
commit 32f9bd4e8b
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
MetadataCrypt.cpp
View file

@ -286,11 +286,6 @@ bool fscrypt_mount_metadata_encrypted(const std::string& blk_device, const std::
LOG(ERROR) << "Failed to get data_rec for " << mount_point;
return false;
}
if (blk_device != data_rec->blk_device) {
LOG(ERROR) << "blk_device " << blk_device << " does not match fstab entry "
<< data_rec->blk_device << " for " << mount_point;
return false;
}
bool is_legacy;
if (!DmTargetDefaultKey::IsLegacy(&is_legacy)) return false;
@ -319,8 +314,7 @@ bool fscrypt_mount_metadata_encrypted(const std::string& blk_device, const std::
std::string crypto_blkdev;
uint64_t nr_sec;
if (!create_crypto_blk_dev(kDmNameUserdata, data_rec->blk_device, key, options, &crypto_blkdev,
&nr_sec))
if (!create_crypto_blk_dev(kDmNameUserdata, blk_device, key, options, &crypto_blkdev, &nr_sec))
return false;
// FIXME handle the corrupt case
@ -341,7 +335,7 @@ bool fscrypt_mount_metadata_encrypted(const std::string& blk_device, const std::
}
LOG(DEBUG) << "Mounting metadata-encrypted filesystem:" << mount_point;
mount_via_fs_mgr(data_rec->mount_point.c_str(), crypto_blkdev.c_str());
mount_via_fs_mgr(mount_point.c_str(), crypto_blkdev.c_str());
return true;
}