summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-03-24 00:11:04 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-03-24 00:11:04 +0100
commit7ce215d3b9666d0a0194612f1f148e2a89d3346d (patch)
treebfb6f9224ca7d1251d024e981b267d41f653e370
parentMerge "f2fs: support f2fs by setting unmovable bit for package file" (diff)
parentMerge "update_verifier: Support verifying product partition." (diff)
downloadandroid_bootable_recovery-7ce215d3b9666d0a0194612f1f148e2a89d3346d.tar
android_bootable_recovery-7ce215d3b9666d0a0194612f1f148e2a89d3346d.tar.gz
android_bootable_recovery-7ce215d3b9666d0a0194612f1f148e2a89d3346d.tar.bz2
android_bootable_recovery-7ce215d3b9666d0a0194612f1f148e2a89d3346d.tar.lz
android_bootable_recovery-7ce215d3b9666d0a0194612f1f148e2a89d3346d.tar.xz
android_bootable_recovery-7ce215d3b9666d0a0194612f1f148e2a89d3346d.tar.zst
android_bootable_recovery-7ce215d3b9666d0a0194612f1f148e2a89d3346d.zip
-rw-r--r--tests/component/update_verifier_test.cpp3
-rw-r--r--update_verifier/update_verifier.cpp22
2 files changed, 11 insertions, 14 deletions
diff --git a/tests/component/update_verifier_test.cpp b/tests/component/update_verifier_test.cpp
index b04e1185e..1544bb2a4 100644
--- a/tests/component/update_verifier_test.cpp
+++ b/tests/component/update_verifier_test.cpp
@@ -46,7 +46,6 @@ TEST_F(UpdateVerifierTest, verify_image_smoke) {
return;
}
- // The care map file can have only two or four lines.
TemporaryFile temp_file;
std::string content = "system\n2,0,1";
ASSERT_TRUE(android::base::WriteStringToFile(content, temp_file.path));
@@ -58,7 +57,7 @@ TEST_F(UpdateVerifierTest, verify_image_smoke) {
}
TEST_F(UpdateVerifierTest, verify_image_wrong_lines) {
- // The care map file can have only two or four lines.
+ // The care map file can have only 2 / 4 / 6 lines.
TemporaryFile temp_file;
ASSERT_FALSE(verify_image(temp_file.path));
diff --git a/update_verifier/update_verifier.cpp b/update_verifier/update_verifier.cpp
index c5e154f03..92d931371 100644
--- a/update_verifier/update_verifier.cpp
+++ b/update_verifier/update_verifier.cpp
@@ -74,14 +74,13 @@ static int dm_name_filter(const dirent* de) {
}
static bool read_blocks(const std::string& partition, const std::string& range_str) {
- if (partition != "system" && partition != "vendor") {
- LOG(ERROR) << "partition name must be system or vendor: " << partition;
+ if (partition != "system" && partition != "vendor" && partition != "product") {
+ LOG(ERROR) << "Invalid partition name \"" << partition << "\"";
return false;
}
- // Iterate the content of "/sys/block/dm-X/dm/name". If it matches "system"
- // (or "vendor"), then dm-X is a dm-wrapped system/vendor partition.
- // Afterwards, update_verifier will read every block on the care_map_file of
- // "/dev/block/dm-X" to ensure the partition's integrity.
+ // Iterate the content of "/sys/block/dm-X/dm/name". If it matches one of "system", "vendor" or
+ // "product", then dm-X is a dm-wrapped device for that target. We will later read all the
+ // ("cared") blocks from "/dev/block/dm-X" to ensure the target partition's integrity.
static constexpr auto DM_PATH_PREFIX = "/sys/block/";
dirent** namelist;
int n = scandir(DM_PATH_PREFIX, &namelist, dm_name_filter, alphasort);
@@ -206,10 +205,9 @@ bool verify_image(const std::string& care_map_name) {
PLOG(WARNING) << "Failed to open " << care_map_name;
return true;
}
- // Care map file has four lines (two lines if vendor partition is not present):
- // First line has the block partition name (system/vendor).
- // Second line holds all ranges of blocks to verify.
- // The next two lines have the same format but for vendor partition.
+ // care_map file has up to six lines, where every two lines make a pair. Within each pair, the
+ // first line has the partition name (e.g. "system"), while the second line holds the ranges of
+ // all the blocks to verify.
std::string file_content;
if (!android::base::ReadFdToString(care_map_fd.get(), &file_content)) {
LOG(ERROR) << "Error reading care map contents to string.";
@@ -218,9 +216,9 @@ bool verify_image(const std::string& care_map_name) {
std::vector<std::string> lines;
lines = android::base::Split(android::base::Trim(file_content), "\n");
- if (lines.size() != 2 && lines.size() != 4) {
+ if (lines.size() != 2 && lines.size() != 4 && lines.size() != 6) {
LOG(ERROR) << "Invalid lines in care_map: found " << lines.size()
- << " lines, expecting 2 or 4 lines.";
+ << " lines, expecting 2 or 4 or 6 lines.";
return false;
}