Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b53e5a2 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Added check to copy AVB footer" am: 4aa47338 am: 4b978262 am:... 

Merge "Added check to copy AVB footer" am: 4aa47338 am: 4b978262 am: 7e5d9609 am: fbd4e76f am: 66a6b2ed

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2512556



Change-Id: I396278ecd456be8381e866230394d8aac04facf1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ece310b1 66a6b2ed

fastboot/fastboot.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,8 @@ 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 || is_logical(partition)) {

    if (buf->sz < AVB_FOOTER_SIZE || is_logical(partition) ||

        should_flash_in_userspace(partition)) {

        return;

    }

    // If overflows and negative, it should be < buf->sz.