Merge "update_verifier: Move property_get() to android::base::GetProperty()." (42906e06) · Commits · e / tools / etwrp

update_verifier/update_verifier.cpp

+46 −48

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@
		*
		* The current slot will be marked as having booted successfully if the
		* verifier reaches the end after the verification.
		*
		*/

		#include <errno.h>
		@@ -42,9 +41,9 @@
		#include <android-base/file.h>
		#include <android-base/logging.h>
		#include <android-base/parseint.h>
		#include <android-base/properties.h>
		#include <android-base/strings.h>
		#include <android-base/unique_fd.h>
		#include <cutils/properties.h>
		#include <android/hardware/boot/1.0/IBootControl.h>

		using android::sp;
		@@ -56,9 +55,8 @@ constexpr auto CARE_MAP_FILE = "/data/ota_package/care_map.txt";
		constexpr int BLOCKSIZE = 4096;

		static bool read_blocks(const std::string& blk_device_prefix, const std::string& range_str) {
		char slot_suffix[PROPERTY_VALUE_MAX];
		property_get("ro.boot.slot_suffix", slot_suffix, "");
		std::string blk_device = blk_device_prefix + std::string(slot_suffix);
		std::string slot_suffix = android::base::GetProperty("ro.boot.slot_suffix", "");
		std::string blk_device = blk_device_prefix + slot_suffix;
		android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(blk_device.c_str(), O_RDONLY)));
		if (fd.get() == -1) {
		PLOG(ERROR) << "Error reading partition " << blk_device;
		@@ -71,7 +69,7 @@ static bool read_blocks(const std::string& blk_device_prefix, const std::string&
		// For example '4,64536,65343,74149,74150' represents: [64536,65343) and [74149,74150).
		std::vector<std::string> ranges = android::base::Split(range_str, ",");
		size_t range_count;
		bool status = android::base::ParseUint(ranges[0].c_str(), &range_count);
		bool status = android::base::ParseUint(ranges[0], &range_count);
		if (!status \|\| (range_count == 0) \|\| (range_count % 2 != 0) \|\|
		(range_count != ranges.size() - 1)) {
		LOG(ERROR) << "Error in parsing range string.";
		@@ -81,8 +79,8 @@ static bool read_blocks(const std::string& blk_device_prefix, const std::string&
		size_t blk_count = 0;
		for (size_t i = 1; i < ranges.size(); i += 2) {
		unsigned int range_start, range_end;
		bool parse_status = android::base::ParseUint(ranges[i].c_str(), &range_start);
		parse_status = parse_status && android::base::ParseUint(ranges[i+1].c_str(), &range_end);
		bool parse_status = android::base::ParseUint(ranges[i], &range_start);
		parse_status = parse_status && android::base::ParseUint(ranges[i + 1], &range_end);
		if (!parse_status \|\| range_start >= range_end) {
		LOG(ERROR) << "Invalid range pair " << ranges[i] << ", " << ranges[i + 1];
		return false;
		@@ -160,16 +158,16 @@ int main(int argc, char** argv) {

		if (is_successful == BoolResult::FALSE) {
		// The current slot has not booted successfully.
		char verity_mode[PROPERTY_VALUE_MAX];
		if (property_get("ro.boot.veritymode", verity_mode, "") == -1) {
		std::string verity_mode = android::base::GetProperty("ro.boot.veritymode", "");
		if (verity_mode.empty()) {
		LOG(ERROR) << "Failed to get dm-verity mode.";
		return -1;
		} else if (strcasecmp(verity_mode, "eio") == 0) {
		} else if (android::base::EqualsIgnoreCase(verity_mode, "eio")) {
		// We shouldn't see verity in EIO mode if the current slot hasn't booted
		// successfully before. Therefore, fail the verification when veritymode=eio.
		LOG(ERROR) << "Found dm-verity in EIO mode, skip verification.";
		return -1;
		} else if (strcmp(verity_mode, "enforcing") != 0) {
		} else if (verity_mode != "enforcing") {
		LOG(ERROR) << "Unexpected dm-verity mode : " << verity_mode << ", expecting enforcing.";
		return -1;
		} else if (!verify_image(CARE_MAP_FILE)) {