Support verity writes in VABC
Test: generate an OTA with verity enabled, install it
Bug: 173432386
Change-Id: I14cccb1bb339c9824a95b8e42ac5144cb8b75c3f
diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc
index 4efbe41..09dc638 100644
--- a/payload_consumer/filesystem_verifier_action.cc
+++ b/payload_consumer/filesystem_verifier_action.cc
@@ -32,8 +32,10 @@
#include <base/strings/string_util.h>
#include <brillo/data_encoding.h>
#include <brillo/message_loops/message_loop.h>
+#include <brillo/secure_blob.h>
#include <brillo/streams/file_stream.h>
+#include "payload_generator/delta_diff_generator.h"
#include "update_engine/common/utils.h"
#include "update_engine/payload_consumer/file_descriptor.h"
@@ -106,8 +108,7 @@
}
void FilesystemVerifierAction::Cleanup(ErrorCode code) {
- read_fd_.reset();
- write_fd_.reset();
+ partition_fd_.reset();
// This memory is not used anymore.
buffer_.clear();
@@ -129,36 +130,30 @@
const InstallPlan::Partition& partition =
install_plan_.partitions[partition_index_];
- read_fd_ =
+ // FilesystemVerifierAction need the read_fd_.
+ partition_fd_ =
dynamic_control_->OpenCowFd(partition.name, partition.source_path, true);
- if (!read_fd_) {
+ if (!partition_fd_) {
LOG(ERROR) << "OpenCowReader(" << partition.name << ", "
<< partition.source_path << ") failed.";
return false;
}
partition_size_ = partition.target_size;
- // TODO(b/173432386): Support Verity writes for VABC.
- CHECK_EQ(partition.fec_size, 0U);
- CHECK_EQ(partition.hash_tree_size, 0U);
return true;
}
bool FilesystemVerifierAction::InitializeFd(const std::string& part_path) {
- read_fd_ = FileDescriptorPtr(new EintrSafeFileDescriptor());
- if (!read_fd_->Open(part_path.c_str(), O_RDONLY)) {
+ partition_fd_ = FileDescriptorPtr(new EintrSafeFileDescriptor());
+ const bool write_verity = ShouldWriteVerity();
+ int flags = write_verity ? O_RDWR : O_RDONLY;
+ if (!utils::SetBlockDeviceReadOnly(part_path, !write_verity)) {
+ LOG(WARNING) << "Failed to set block device " << part_path << " as "
+ << (write_verity ? "writable" : "readonly");
+ }
+ if (!partition_fd_->Open(part_path.c_str(), flags)) {
LOG(ERROR) << "Unable to open " << part_path << " for reading.";
return false;
}
-
- // Can't re-use |read_fd_|, as verity writer may call `seek` to modify state
- // of a file descriptor.
- if (ShouldWriteVerity()) {
- write_fd_ = FileDescriptorPtr(new EintrSafeFileDescriptor());
- if (!write_fd_->Open(part_path.c_str(), O_RDWR)) {
- LOG(ERROR) << "Unable to open " << part_path << " for Read/Write.";
- return false;
- }
- }
return true;
}
@@ -238,9 +233,12 @@
}
if (ShouldWriteVerity()) {
if (!verity_writer_->Init(partition)) {
+ LOG(INFO) << "Verity writes enabled on partition " << partition.name;
Cleanup(ErrorCode::kVerityCalculationError);
return;
}
+ } else {
+ LOG(INFO) << "Verity writes disabled on partition " << partition.name;
}
// Start the first read.
@@ -257,19 +255,19 @@
void FilesystemVerifierAction::ReadVerityAndFooter() {
if (ShouldWriteVerity()) {
- if (!verity_writer_->Finalize(read_fd_, write_fd_)) {
+ if (!verity_writer_->Finalize(partition_fd_, partition_fd_)) {
LOG(ERROR) << "Failed to write hashtree/FEC data.";
Cleanup(ErrorCode::kFilesystemVerifierError);
return;
}
}
+ // Since we handed our |read_fd_| to verity_writer_ during |Finalize()|
+ // call, fd's position could have been changed. Re-seek.
+ partition_fd_->Seek(filesystem_data_end_, SEEK_SET);
auto bytes_to_read = partition_size_ - filesystem_data_end_;
- // Since we handed our |read_fd_| to verity_writer_ during |Finalize()| call,
- // fd's position could have been changed. Re-seek.
- read_fd_->Seek(filesystem_data_end_, SEEK_SET);
while (bytes_to_read > 0) {
const auto read_size = std::min<size_t>(buffer_.size(), bytes_to_read);
- auto bytes_read = read_fd_->Read(buffer_.data(), read_size);
+ auto bytes_read = partition_fd_->Read(buffer_.data(), read_size);
if (bytes_read <= 0) {
PLOG(ERROR) << "Failed to read hash tree " << bytes_read;
Cleanup(ErrorCode::kFilesystemVerifierError);
@@ -296,10 +294,11 @@
ReadVerityAndFooter();
return;
}
-
- auto bytes_read = read_fd_->Read(buffer_.data(), bytes_to_read);
+ partition_fd_->Seek(offset_, SEEK_SET);
+ auto bytes_read = partition_fd_->Read(buffer_.data(), bytes_to_read);
if (bytes_read < 0) {
- LOG(ERROR) << "Unable to schedule an asynchronous read from the stream.";
+ LOG(ERROR) << "Unable to schedule an asynchronous read from the stream. "
+ << bytes_read;
Cleanup(ErrorCode::kError);
} else {
// We could just invoke |OnReadDoneCallback()|, it works. But |PostTask|
@@ -424,11 +423,8 @@
// Start hashing the next partition, if any.
hasher_.reset();
buffer_.clear();
- if (read_fd_) {
- read_fd_.reset();
- }
- if (write_fd_) {
- write_fd_.reset();
+ if (partition_fd_) {
+ partition_fd_.reset();
}
StartPartitionHashing();
}