Snap for 12337407 from 3b0fa118acf9a460015a25281e5184ebe7bf997e to 25Q2-release
Change-Id: I056883c7593e3445c4ad08f091d3ad89e4e7b57e
diff --git a/payload_consumer/filesystem_verifier_action.cc b/payload_consumer/filesystem_verifier_action.cc
index 2934fb7..2e2f6b9 100644
--- a/payload_consumer/filesystem_verifier_action.cc
+++ b/payload_consumer/filesystem_verifier_action.cc
@@ -406,7 +406,6 @@
buffer_.resize(kReadFileBufferSize);
hasher_ = std::make_unique<HashCalculator>();
- offset_ = 0;
filesystem_data_end_ = partition_size_;
if (partition.fec_offset > 0) {
CHECK_LE(partition.hash_tree_offset, partition.fec_offset)
@@ -456,7 +455,7 @@
}
}
-size_t FilesystemVerifierAction::GetPartitionSize() const {
+uint64_t FilesystemVerifierAction::GetPartitionSize() const {
const InstallPlan::Partition& partition =
install_plan_.partitions[partition_index_];
switch (verifier_step_) {
diff --git a/payload_consumer/filesystem_verifier_action.h b/payload_consumer/filesystem_verifier_action.h
index 5bc44b1..d8cb902 100644
--- a/payload_consumer/filesystem_verifier_action.h
+++ b/payload_consumer/filesystem_verifier_action.h
@@ -109,7 +109,7 @@
bool IsVABC(const InstallPlan::Partition& partition) const;
- size_t GetPartitionSize() const;
+ uint64_t GetPartitionSize() const;
// When the read is done, finalize the hash checking of the current partition
// and continue checking the next one.
@@ -163,9 +163,6 @@
// partition in gpt.
uint64_t partition_size_{0};
- // The byte offset that we are reading in the current partition.
- uint64_t offset_{0};
-
// The end offset of filesystem data, first byte position of hashtree.
uint64_t filesystem_data_end_{0};
diff --git a/payload_consumer/verity_writer_android.cc b/payload_consumer/verity_writer_android.cc
index 4a476d2..d808dd5 100644
--- a/payload_consumer/verity_writer_android.cc
+++ b/payload_consumer/verity_writer_android.cc
@@ -78,7 +78,7 @@
// Encodes |block_size| number of rs blocks each round so that we can read
// one block each time instead of 1 byte to increase random read
// performance. This uses about 1 MiB memory for 4K block size.
- for (size_t j = 0; j < rs_n_; j++) {
+ for (uint64_t j = 0; j < rs_n_; j++) {
uint64_t offset = fec_ecc_interleave(
current_round_ * rs_n_ * block_size_ + j, rs_n_, num_rounds_);
// Don't read past |data_size|, treat them as 0.
@@ -95,11 +95,11 @@
TEST_AND_RETURN_FALSE(static_cast<size_t>(bytes_read) ==
buffer_.size());
}
- for (size_t k = 0; k < buffer_.size(); k++) {
+ for (uint64_t k = 0; k < buffer_.size(); k++) {
rs_blocks_[k * rs_n_ + j] = buffer_[k];
}
}
- for (size_t j = 0; j < block_size_; j++) {
+ for (uint64_t j = 0; j < block_size_; j++) {
// Encode [j * rs_n_ : (j + 1) * rs_n_) in |rs_blocks| and write
// |fec_roots| number of parity bytes to |j * fec_roots| in |fec|.
encode_rs_char(rs_char_.get(),
diff --git a/payload_consumer/verity_writer_android.h b/payload_consumer/verity_writer_android.h
index 1aaafd5..9926988 100644
--- a/payload_consumer/verity_writer_android.h
+++ b/payload_consumer/verity_writer_android.h
@@ -63,8 +63,8 @@
brillo::Blob fec_;
brillo::Blob fec_read_;
EncodeFECStep current_step_;
- size_t current_round_;
- size_t num_rounds_;
+ uint64_t current_round_;
+ uint64_t num_rounds_;
FileDescriptor* read_fd_;
FileDescriptor* write_fd_;
uint64_t data_offset_;
@@ -73,7 +73,7 @@
uint64_t fec_size_;
uint64_t fec_roots_;
uint64_t block_size_;
- size_t rs_n_;
+ uint64_t rs_n_;
bool verify_mode_;
std::unique_ptr<void, decltype(&free_rs_char)> rs_char_;
UnownedCachedFileDescriptor cache_fd_;