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

Merge "Fix signedness mismatch and integer underflow"

Browse source 
am: b46a2f7dea

Change-Id: Ie2fcbf4af0ae882d67e7ecdbaf7db56b68eabf36
This commit is contained in:
Rubin Xu 2018-12-07 03:23:23 -08:00 committed by android-build-merger
commit f0c4361770
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cryptfs.cpp
View file

@ -2458,24 +2458,25 @@ int cryptfs_changepw(int crypt_type, const char* newpw) {
static unsigned int persist_get_max_entries(int encrypted) {
struct crypt_mnt_ftr crypt_ftr;
unsigned int dsize;
unsigned int max_persistent_entries;
/* If encrypted, use the values from the crypt_ftr, otherwise
* use the values for the current spec.
*/
if (encrypted) {
if (get_crypt_ftr_and_key(&crypt_ftr)) {
return -1;
/* Something is wrong, assume no space for entries */
return 0;
}
dsize = crypt_ftr.persist_data_size;
} else {
dsize = CRYPT_PERSIST_DATA_SIZE;
}
max_persistent_entries =
(dsize - sizeof(struct crypt_persist_data)) / sizeof(struct crypt_persist_entry);
return max_persistent_entries;
if (dsize > sizeof(struct crypt_persist_data)) {
return (dsize - sizeof(struct crypt_persist_data)) / sizeof(struct crypt_persist_entry);
} else {
return 0;
}
}
static int persist_get_key(const char* fieldname, char* value) {