ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "fastbootd: copy AVB footer on boot image to end of block device"

Browse source
This commit is contained in:
Treehugger Robot 2020-05-13 19:38:03 +00:00 • committed by Gerrit Code Review
commit 37f45fcd3b
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fastboot/Android.bp
View file

@ -149,6 +149,7 @@ cc_binary {
], ],
header_libs: [ header_libs: [
"avb_headers",
"libsnapshot_headers", "libsnapshot_headers",
] ]
} }

30
fastboot/device/flashing.cpp
View file

@ -31,6 +31,7 @@
#include <ext4_utils/ext4_utils.h> #include <ext4_utils/ext4_utils.h>
#include <fs_mgr_overlayfs.h> #include <fs_mgr_overlayfs.h>
#include <fstab/fstab.h> #include <fstab/fstab.h>
#include <libavb/libavb.h>
#include <liblp/builder.h> #include <liblp/builder.h>
#include <liblp/liblp.h> #include <liblp/liblp.h>
#include <libsnapshot/snapshot.h> #include <libsnapshot/snapshot.h>
@ -122,6 +123,27 @@ int FlashBlockDevice(int fd, std::vector<char>& downloaded_data) {
} }
} }
static void CopyAVBFooter(std::vector<char>* data, const uint64_t block_device_size) {
if (data->size() < AVB_FOOTER_SIZE) {
return;
}
std::string footer;
uint64_t footer_offset = data->size() - AVB_FOOTER_SIZE;
for (int idx = 0; idx < AVB_FOOTER_MAGIC_LEN; idx++) {
footer.push_back(data->at(footer_offset + idx));
}
if (0 != footer.compare(AVB_FOOTER_MAGIC)) {
return;
}
// copy AVB footer from end of data to end of block device
uint64_t original_data_size = data->size();
data->resize(block_device_size, 0);
for (int idx = 0; idx < AVB_FOOTER_SIZE; idx++) {
data->at(block_device_size - 1 - idx) = data->at(original_data_size - 1 - idx);
}
}
int Flash(FastbootDevice* device, const std::string& partition_name) { int Flash(FastbootDevice* device, const std::string& partition_name) {
PartitionHandle handle; PartitionHandle handle;
if (!OpenPartition(device, partition_name, &handle)) { if (!OpenPartition(device, partition_name, &handle)) {
@ -131,8 +153,14 @@ int Flash(FastbootDevice* device, const std::string& partition_name) {
std::vector<char> data = std::move(device->download_data()); std::vector<char> data = std::move(device->download_data());
if (data.size() == 0) { if (data.size() == 0) {
return -EINVAL; return -EINVAL;
} else if (data.size() > get_block_device_size(handle.fd())) { }
uint64_t block_device_size = get_block_device_size(handle.fd());
if (data.size() > block_device_size) {
return -EOVERFLOW; return -EOVERFLOW;
} else if (data.size() < block_device_size &&
(partition_name == "boot" || partition_name == "boot_a" ||
partition_name == "boot_b")) {
CopyAVBFooter(&data, block_device_size);
} }
WipeOverlayfsForPartition(device, partition_name); WipeOverlayfsForPartition(device, partition_name);
int result = FlashBlockDevice(handle.fd(), data); int result = FlashBlockDevice(handle.fd(), data);