tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix non-ab fuse ota fail bug

Browse source 
Fix the 'Calculate the offset to last partial block' logic in
ReadBlockAligndData. If file_size % fuse_block_size_ < source_block_size_,
the origin map logic will get a wrong block address of last block.
This bug leads to the non-ab fuse ota fail.

Test: compare the md5 of origin pkg and pkg reading from fuse.
Change-Id: Ic5132a7e9919cc2e91390231be342b97421ea23e
This commit is contained in:
Cheng Chang 2021-12-27 16:40:29 +08:00
parent 86df64785a
commit a0732906ae
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fuse_sideload/fuse_provider.cpp
View file

@ -118,11 +118,16 @@ bool FuseBlockDataProvider::ReadBlockAlignedData(uint8_t* buffer, uint32_t fetch
} }
if (uint64_t tailing_bytes = fetch_size % source_block_size_; tailing_bytes != 0) { if (uint64_t tailing_bytes = fetch_size % source_block_size_; tailing_bytes != 0) {
// Calculate the offset to last partial block. // Calculate the offset to last partial block. Two possibilities as below:
// 1: fetch_size < source_block_size_, the read_ranges is a blank range_set.
// Get the last block num through GetBlockNumber() of the offset block.
// 2: fetch_size >= source_block_size_, the last block num is already stored
// in read-ranges by GetSubRanges() above.
uint64_t tailing_offset = uint64_t tailing_offset =
read_ranges.value() read_ranges.value()
? static_cast<uint64_t>((read_ranges->cend() - 1)->second) * source_block_size_ ? static_cast<uint64_t>((read_ranges->cend() - 1)->second) * source_block_size_
: static_cast<uint64_t>(start_block) * source_block_size_; : static_cast<uint64_t>(ranges_.GetBlockNumber(offset / source_block_size_)) *
source_block_size_;
if (!android::base::ReadFullyAtOffset(fd_, next_out, tailing_bytes, tailing_offset)) { if (!android::base::ReadFullyAtOffset(fd_, next_out, tailing_bytes, tailing_offset)) {
PLOG(ERROR) << "Failed to read tailing " << tailing_bytes << " bytes at offset " PLOG(ERROR) << "Failed to read tailing " << tailing_bytes << " bytes at offset "
<< tailing_offset; << tailing_offset;