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

Merge "Removed hardcoded check to copy AVB Footer"

Browse source
This commit is contained in:
Daniel Zheng 2023-03-20 23:24:56 +00:00 • committed by Gerrit Code Review
commit 51a3661421
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fastboot/fastboot.cpp
View file

@ -1202,10 +1202,9 @@ static uint64_t get_partition_size(const std::string& partition) {
}
static void copy_avb_footer(const std::string& partition, struct fastboot_buffer* buf) {
if (buf->sz < AVB_FOOTER_SIZE) {
if (buf->sz < AVB_FOOTER_SIZE || is_logical(partition)) {
return;
}
// If overflows and negative, it should be < buf->sz.
int64_t partition_size = static_cast<int64_t>(get_partition_size(partition));
@ -1259,11 +1258,7 @@ void flash_partition_files(const std::string& partition, const std::vector<Spars
static void flash_buf(const std::string& partition, struct fastboot_buffer* buf,
const bool apply_vbmeta) {
if (partition == "boot" || partition == "boot_a" || partition == "boot_b" ||
partition == "init_boot" || partition == "init_boot_a" || partition == "init_boot_b" ||
partition == "recovery" || partition == "recovery_a" || partition == "recovery_b") {
copy_avb_footer(partition, buf);
}
copy_avb_footer(partition, buf);
// Rewrite vbmeta if that's what we're flashing and modification has been requested.
if (g_disable_verity || g_disable_verification) {