| Révision | 89858102c2272fb10c040b447eb482ddc497585f (tree) |
|---|---|
| l'heure | 2018-10-12 08:16:03 |
| Auteur | Rubin Xu <rubinxu@goog...> |
| Commiter | android-build-merger |
Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b
am: b1498d1d87
Change-Id: Ic7ef94c42d54d4f29c92bad98001bd6e065f5013
cryptfs.cpp (diff)| @@ -2488,24 +2488,25 @@ int cryptfs_changepw(int crypt_type, const char *newpw) | ||
| 2488 | 2488 | static unsigned int persist_get_max_entries(int encrypted) { |
| 2489 | 2489 | struct crypt_mnt_ftr crypt_ftr; |
| 2490 | 2490 | unsigned int dsize; |
| 2491 | - unsigned int max_persistent_entries; | |
| 2492 | 2491 | |
| 2493 | 2492 | /* If encrypted, use the values from the crypt_ftr, otherwise |
| 2494 | 2493 | * use the values for the current spec. |
| 2495 | 2494 | */ |
| 2496 | 2495 | if (encrypted) { |
| 2497 | 2496 | if (get_crypt_ftr_and_key(&crypt_ftr)) { |
| 2498 | - return -1; | |
| 2497 | + /* Something is wrong, assume no space for entries */ | |
| 2498 | + return 0; | |
| 2499 | 2499 | } |
| 2500 | 2500 | dsize = crypt_ftr.persist_data_size; |
| 2501 | 2501 | } else { |
| 2502 | 2502 | dsize = CRYPT_PERSIST_DATA_SIZE; |
| 2503 | 2503 | } |
| 2504 | 2504 | |
| 2505 | - max_persistent_entries = (dsize - sizeof(struct crypt_persist_data)) / | |
| 2506 | - sizeof(struct crypt_persist_entry); | |
| 2507 | - | |
| 2508 | - return max_persistent_entries; | |
| 2505 | + if (dsize > sizeof(struct crypt_persist_data)) { | |
| 2506 | + return (dsize - sizeof(struct crypt_persist_data)) / sizeof(struct crypt_persist_entry); | |
| 2507 | + } else { | |
| 2508 | + return 0; | |
| 2509 | + } | |
| 2509 | 2510 | } |
| 2510 | 2511 | |
| 2511 | 2512 | static int persist_get_key(const char *fieldname, char *value) |
Android-x86
Fork