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

Commit 4cc20f6e authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "fastboot: Don't fail when unable to get boot partition size" am:... 

Merge "fastboot: Don't fail when unable to get boot partition size" am: 527cdd46 am: f2e5282e am: fe191161 am: 7f64dc1f

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

Change-Id: I176c6e479e599093a6050d5b78a274d41fef3117
parents 5cb7a6b8 7f64dc1f

fastboot/fastboot.cpp

+20 −15
Original line number Diff line number Diff line
@@ -1007,6 +1007,11 @@ static bool has_vbmeta_partition() { 
           fb->GetVar("partition-type:vbmeta_b", &partition_type) == fastboot::SUCCESS;

}



static bool is_logical(const std::string& partition) {

    std::string value;

    return fb->GetVar("is-logical:" + partition, &value) == fastboot::SUCCESS && value == "yes";

}



static std::string fb_fix_numeric_var(std::string var) {

    // Some bootloaders (angler, for example), send spurious leading whitespace.

    var = android::base::Trim(var);
@@ -1019,12 +1024,18 @@ static std::string fb_fix_numeric_var(std::string var) { 
static uint64_t get_partition_size(const std::string& partition) {

    std::string partition_size_str;

    if (fb->GetVar("partition-size:" + partition, &partition_size_str) != fastboot::SUCCESS) {

        if (!is_logical(partition)) {

            return 0;

        }

        die("cannot get partition size for %s", partition.c_str());

    }



    partition_size_str = fb_fix_numeric_var(partition_size_str);

    uint64_t partition_size;

    if (!android::base::ParseUint(partition_size_str, &partition_size)) {

        if (!is_logical(partition)) {

            return 0;

        }

        die("Couldn't parse partition size '%s'.", partition_size_str.c_str());

    }

    return partition_size;
@@ -1035,16 +1046,6 @@ static void copy_boot_avb_footer(const std::string& partition, struct fastboot_b 
        return;

    }



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

    int64_t partition_size = static_cast<int64_t>(get_partition_size(partition));



    if (partition_size == buf->sz) {

        return;

    }

    if (partition_size < buf->sz) {

        die("boot partition is smaller than boot image");

    }



    std::string data;

    if (!android::base::ReadFdToString(buf->fd, &data)) {

        die("Failed reading from boot");
@@ -1054,6 +1055,15 @@ static void copy_boot_avb_footer(const std::string& partition, struct fastboot_b 
    if (0 != data.compare(footer_offset, AVB_FOOTER_MAGIC_LEN, AVB_FOOTER_MAGIC)) {

        return;

    }

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

    int64_t partition_size = static_cast<int64_t>(get_partition_size(partition));



    if (partition_size == buf->sz) {

        return;

    }

    if (partition_size < buf->sz) {

        die("boot partition is smaller than boot image");

    }



    unique_fd fd(make_temporary_fd("boot rewriting"));

    if (!android::base::WriteStringToFd(data, fd)) {
@@ -1250,11 +1260,6 @@ static void do_for_partitions(const std::string& part, const std::string& slot, 
    }

}



static bool is_logical(const std::string& partition) {

    std::string value;

    return fb->GetVar("is-logical:" + partition, &value) == fastboot::SUCCESS && value == "yes";

}



static bool is_retrofit_device() {

    std::string value;

    if (fb->GetVar("super-partition-name", &value) != fastboot::SUCCESS) {