diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-10 03:48:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 03:48:41 +0000 |
| commit | 603c7d0d95e6d406004da58287c60568fab4d1be (patch) | |
| tree | 38d8ce4d4cab7184006e6d4cac555eb9687f8c1c /fs_mgr | |
| parent | 2f38122a0f77db4e002abfcb313ddfc06fa5fba2 (diff) | |
| parent | 294e610f886eeb839d16172bb5b98559a6a7434d (diff) | |
| download | system_core-603c7d0d95e6d406004da58287c60568fab4d1be.zip system_core-603c7d0d95e6d406004da58287c60568fab4d1be.tar.gz system_core-603c7d0d95e6d406004da58287c60568fab4d1be.tar.bz2 | |
am 294e610f: Merge "Fix verity on system partitions larger than 2G"
* commit '294e610f886eeb839d16172bb5b98559a6a7434d':
Fix verity on system partitions larger than 2G
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_verity.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs_mgr/fs_mgr_verity.c b/fs_mgr/fs_mgr_verity.c index a452dce..55a6de8 100644 --- a/fs_mgr/fs_mgr_verity.c +++ b/fs_mgr/fs_mgr_verity.c @@ -155,7 +155,7 @@ static int read_verity_metadata(char *block_device, char **signature, char **tab unsigned table_length; uint64_t device_length; int protocol_version; - FILE *device; + int device; int retval = FS_MGR_SETUP_VERITY_FAIL; *signature = 0; *table = 0; @@ -238,11 +238,12 @@ static int read_verity_metadata(char *block_device, char **signature, char **tab goto out; } + (*table)[table_length] = 0; retval = FS_MGR_SETUP_VERITY_SUCCESS; out: - if (device) - fclose(device); + if (device != -1) + TEMP_FAILURE_RETRY(close(device)); if (retval != FS_MGR_SETUP_VERITY_SUCCESS) { free(*table); |