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

Merge "root: Fix an issue when volume length from fs_mgr is negative."

Browse source
This commit is contained in:
Treehugger Robot 2017-11-20 18:47:56 +00:00 committed by Gerrit Code Review
commit 5ce9fe355c
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
roots.cpp
View file

@ -262,17 +262,20 @@ int format_volume(const char* volume, const char* directory) {
} }
int64_t length = 0; int64_t length = 0;
if (v->length != 0) { if (v->length > 0) {
length = v->length; length = v->length;
} else if (v->key_loc != nullptr && strcmp(v->key_loc, "footer") == 0) { } else if (v->length < 0 ||
(v->key_loc != nullptr && strcmp(v->key_loc, "footer") == 0)) {
android::base::unique_fd fd(open(v->blk_device, O_RDONLY)); android::base::unique_fd fd(open(v->blk_device, O_RDONLY));
if (fd == -1) { if (fd == -1) {
PLOG(ERROR) << "format_volume: failed to open " << v->blk_device; PLOG(ERROR) << "format_volume: failed to open " << v->blk_device;
return -1; return -1;
} }
length = get_file_size(fd.get(), CRYPT_FOOTER_OFFSET); length =
get_file_size(fd.get(), v->length ? -v->length : CRYPT_FOOTER_OFFSET);
if (length <= 0) { if (length <= 0) {
LOG(ERROR) << "get_file_size: invalid size " << length << " for " << v->blk_device; LOG(ERROR) << "get_file_size: invalid size " << length << " for "
<< v->blk_device;
return -1; return -1;
} }
} }