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

Fix some static analyser issues

Browse source 
Bug: 27099772
Change-Id: Ic96777edf4ea282be2b8f53525226396c01e023c
This commit is contained in:
Paul Lawrence 2016-03-11 11:02:52 -08:00
parent 439034b8cc
commit 300dae7c38
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
cryptfs.c
View file

@ -164,6 +164,11 @@ static int keymaster_check_compatibility()
goto out;
}
if (!keymaster0_dev || !keymaster0_dev->common.module) {
rc = -1;
goto out;
}
// TODO(swillden): Check to see if there's any reason to require v0.3. I think v0.1 and v0.2
// should work.
if (keymaster0_dev->common.module->module_api_version
@ -889,12 +894,10 @@ static int load_persistent_data(void)
return -1;
}
if (persist_data == NULL) {
pdata = malloc(crypt_ftr.persist_data_size);
if (pdata == NULL) {
SLOGE("Cannot allocate memory for persistent data");
goto err;
}
pdata = malloc(crypt_ftr.persist_data_size);
if (pdata == NULL) {
SLOGE("Cannot allocate memory for persistent data");
goto err;
}
for (i = 0; i < 2; i++) {
@ -3830,6 +3833,11 @@ int cryptfs_get_master_key(struct crypt_mnt_ftr* ftr, const char* password,
rc = decrypt_master_key(password, master_key, ftr, &intermediate_key,
&intermediate_key_size);
if (rc) {
SLOGE("Can't calculate intermediate key");
return rc;
}
int N = 1 << ftr->N_factor;
int r = 1 << ftr->r_factor;
int p = 1 << ftr->p_factor;
@ -3844,7 +3852,7 @@ int cryptfs_get_master_key(struct crypt_mnt_ftr* ftr, const char* password,
free(intermediate_key);
if (rc) {
SLOGE("Can't calculate intermediate key");
SLOGE("Can't scrypt intermediate key");
return rc;
}