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

Consistently use CLOCK_MONOTONIC for timing encryption

Browse source 
time_started in encryptGroupsData is set from and compared to
clock_gettime(CLOCK_MONOTONIC, ...) nearly everywhere: "Clock that
cannot be set and represents monotonic time since some unspecified
starting point". However in cryptfs_enable_inplace_f2fs() it is set
from a different clock, time(NULL), with the result that the setprop
calls that indicate progress are wrong and can be called much too
often. The fix is to make this function consistent with
cryptfs_enable_inplace_ext4.

Bug: 146877356
Change-Id: I2707180e5c5bf723a5a880f6a3aac47f2bb34ccd
This commit is contained in:
Denis Hsu 2019-12-26 16:06:37 +08:00 committed by Paul Crowley
parent 180b1a7f89
commit 1740effeaa
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
EncryptInplace.cpp
View file

@ -391,6 +391,8 @@ static int cryptfs_enable_inplace_f2fs(const char* crypto_blkdev, const char* re
struct encryptGroupsData data; struct encryptGroupsData data;
struct f2fs_info* f2fs_info = NULL; struct f2fs_info* f2fs_info = NULL;
int rc = ENABLE_INPLACE_ERR_OTHER; int rc = ENABLE_INPLACE_ERR_OTHER;
struct timespec time_started = {0};
if (previously_encrypted_upto > *size_already_done) { if (previously_encrypted_upto > *size_already_done) {
LOG(DEBUG) << "Not fast encrypting since resuming part way through"; LOG(DEBUG) << "Not fast encrypting since resuming part way through";
return ENABLE_INPLACE_ERR_OTHER; return ENABLE_INPLACE_ERR_OTHER;
@ -423,9 +425,14 @@ static int cryptfs_enable_inplace_f2fs(const char* crypto_blkdev, const char* re
data.one_pct = data.tot_used_blocks / 100; data.one_pct = data.tot_used_blocks / 100;
data.cur_pct = 0; data.cur_pct = 0;
data.time_started = time(NULL); if (clock_gettime(CLOCK_MONOTONIC, &time_started)) {
LOG(WARNING) << "Error getting time at start";
// Note - continue anyway - we'll run with 0
}
data.time_started = time_started.tv_sec;
data.remaining_time = -1; data.remaining_time = -1;
data.buffer = (char*)malloc(f2fs_info->block_size); data.buffer = (char*)malloc(f2fs_info->block_size);
if (!data.buffer) { if (!data.buffer) {
LOG(ERROR) << "Failed to allocate crypto buffer"; LOG(ERROR) << "Failed to allocate crypto buffer";