| 修訂 | 7f6172bd1b4e0a189691822825b0876893917bb8 (tree) |
|---|---|
| 時間 | 2019-10-16 23:36:58 |
| 作者 | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge tag 'android-7.1.2_r39' into nougat-x86
Android 7.1.2 Release 39 (5787804)
| @@ -237,17 +237,17 @@ static status_t readMetadata(const std::string& path, std::string& fsType, | ||
| 237 | 237 | for (auto line : output) { |
| 238 | 238 | // Extract values from blkid output, if defined |
| 239 | 239 | const char* cline = line.c_str(); |
| 240 | - char* start = strstr(cline, "TYPE="); | |
| 240 | + char* start = strstr(cline, "TYPE=\""); | |
| 241 | 241 | if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) { |
| 242 | 242 | fsType = value; |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | - start = strstr(cline, "UUID="); | |
| 245 | + start = strstr(cline, "UUID=\""); | |
| 246 | 246 | if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) { |
| 247 | 247 | fsUuid = value; |
| 248 | 248 | } |
| 249 | 249 | |
| 250 | - start = strstr(cline, "LABEL="); | |
| 250 | + start = strstr(cline, "LABEL=\""); | |
| 251 | 251 | if (start != nullptr && sscanf(start + 6, "\"%127[^\"]\"", value) == 1) { |
| 252 | 252 | fsLabel = value; |
| 253 | 253 | } |
| @@ -3814,24 +3814,25 @@ int cryptfs_changepw_hw_fde(int crypt_type, const char *currentpw, const char *n | ||
| 3814 | 3814 | static unsigned int persist_get_max_entries(int encrypted) { |
| 3815 | 3815 | struct crypt_mnt_ftr crypt_ftr; |
| 3816 | 3816 | unsigned int dsize; |
| 3817 | - unsigned int max_persistent_entries; | |
| 3818 | 3817 | |
| 3819 | 3818 | /* If encrypted, use the values from the crypt_ftr, otherwise |
| 3820 | 3819 | * use the values for the current spec. |
| 3821 | 3820 | */ |
| 3822 | 3821 | if (encrypted) { |
| 3823 | 3822 | if (get_crypt_ftr_and_key(&crypt_ftr)) { |
| 3824 | - return -1; | |
| 3823 | + /* Something is wrong, assume no space for entries */ | |
| 3824 | + return 0; | |
| 3825 | 3825 | } |
| 3826 | 3826 | dsize = crypt_ftr.persist_data_size; |
| 3827 | 3827 | } else { |
| 3828 | 3828 | dsize = CRYPT_PERSIST_DATA_SIZE; |
| 3829 | 3829 | } |
| 3830 | 3830 | |
| 3831 | - max_persistent_entries = (dsize - sizeof(struct crypt_persist_data)) / | |
| 3832 | - sizeof(struct crypt_persist_entry); | |
| 3833 | - | |
| 3834 | - return max_persistent_entries; | |
| 3831 | + if (dsize > sizeof(struct crypt_persist_data)) { | |
| 3832 | + return (dsize - sizeof(struct crypt_persist_data)) / sizeof(struct crypt_persist_entry); | |
| 3833 | + } else { | |
| 3834 | + return 0; | |
| 3835 | + } | |
| 3835 | 3836 | } |
| 3836 | 3837 | |
| 3837 | 3838 | static int persist_get_key(const char *fieldname, char *value) |
Android-x86
Fork
Utils.cpp
cryptfs.c