diff options
author | Yabin Cui <yabinc@google.com> | 2016-06-09 14:09:39 -0700 |
---|---|---|
committer | Yabin Cui <yabinc@google.com> | 2016-06-20 18:18:02 -0700 |
commit | 6faf0265c9b58db2c15b53f6d29025629d52f882 (patch) | |
tree | fc2e067205a986071615f936e8ff7040e01520f5 /uncrypt/uncrypt.cpp | |
parent | dc1393d09bcc09ae246cd46b2248d9401605d0f5 (diff) | |
download | android_bootable_recovery-6faf0265c9b58db2c15b53f6d29025629d52f882.tar.gz android_bootable_recovery-6faf0265c9b58db2c15b53f6d29025629d52f882.tar.bz2 android_bootable_recovery-6faf0265c9b58db2c15b53f6d29025629d52f882.zip |
Verify wipe package when wiping A/B device in recovery.
To increase the security of wiping A/B devices, let uncrypt write
wipe package in misc partition. Then recovery verifies the wipe
package before wiping the device.
Bug: 29159185
Change-Id: I186691bab1928d3dc036bc5542abd64a81bc2168
Diffstat (limited to 'uncrypt/uncrypt.cpp')
-rw-r--r-- | uncrypt/uncrypt.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index d7105a01..f62d1327 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -503,14 +503,31 @@ static bool setup_bcb(const int socket) { return false; } ALOGI(" received command: [%s] (%zu)", content.c_str(), content.size()); + std::vector<std::string> options = android::base::Split(content, "\n"); + std::string wipe_package; + for (auto& option : options) { + if (android::base::StartsWith(option, "--wipe_package=")) { + std::string path = option.substr(strlen("--wipe_package=")); + if (!android::base::ReadFileToString(path, &wipe_package)) { + ALOGE("failed to read %s: %s", path.c_str(), strerror(errno)); + return false; + } + option = android::base::StringPrintf("--wipe_package_size=%zu", wipe_package.size()); + } + } // c8. setup the bcb command std::string err; - if (!write_bootloader_message({content}, &err)) { + if (!write_bootloader_message(options, &err)) { ALOGE("failed to set bootloader message: %s", err.c_str()); write_status_to_socket(-1, socket); return false; } + if (!wipe_package.empty() && !write_wipe_package(wipe_package, &err)) { + ALOGE("failed to set wipe package: %s", err.c_str()); + write_status_to_socket(-1, socket); + return false; + } // c10. send "100" status write_status_to_socket(100, socket); return true; |