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

Merge "update_verifier: Handle legacy care_map.txt gracefully."

Browse source
This commit is contained in:
Tao Bao 2017-07-24 16:13:14 +00:00 committed by Gerrit Code Review
commit 15ae0f01c3
1 changed files with 45 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
update_verifier/update_verifier.cpp
View file

@ -175,6 +175,13 @@ static bool read_blocks(const std::string& partition, const std::string& range_s
return true;
}
// Returns true to indicate a passing verification (or the error should be ignored); Otherwise
// returns false on fatal errors, where we should reject the current boot and trigger a fallback.
// Note that update_verifier should be backward compatible to not reject care_map.txt from old
// releases, which could otherwise fail to boot into the new release. For example, we've changed
// the care_map format between N and O. An O update_verifier would fail to work with N
// care_map.txt. This could be a result of sideloading an O OTA while the device having a pending N
// update.
bool verify_image(const std::string& care_map_name) {
android::base::unique_fd care_map_fd(TEMP_FAILURE_RETRY(open(care_map_name.c_str(), O_RDONLY)));
// If the device is flashed before the current boot, it may not have care_map.txt
@ -203,6 +210,12 @@ bool verify_image(const std::string& care_map_name) {
}
for (size_t i = 0; i < lines.size(); i += 2) {
// We're seeing an N care_map.txt. Skip the verification since it's not compatible with O
// update_verifier (the last few metadata blocks can't be read via device mapper).
if (android::base::StartsWith(lines[i], "/dev/block/")) {
LOG(WARNING) << "Found legacy care_map.txt; skipped.";
return true;
}
if (!read_blocks(lines[i], lines[i+1])) {
return false;
}