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

Commit 944cc0d0 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Fix fastboot memory corruption." 

am: b6d7f265

Change-Id: Idc566a2dad5cdeeee1b049598d9b92e6cf7c3c73
parents 11ecd636 b6d7f265

fastboot/bootimg_utils.cpp

+5 −3
Original line number Diff line number Diff line
@@ -28,13 +28,15 @@ 


#include "bootimg_utils.h"



#include "fastboot.h"



#include <stdio.h>

#include <stdlib.h>

#include <string.h>



void bootimg_set_cmdline(boot_img_hdr* h, const char* cmdline)

{

    strcpy((char*) h->cmdline, cmdline);

void bootimg_set_cmdline(boot_img_hdr* h, const char* cmdline) {

    if (strlen(cmdline) >= sizeof(h->cmdline)) die("command line too large: %zu", strlen(cmdline));

    strcpy(reinterpret_cast<char*>(h->cmdline), cmdline);

}



boot_img_hdr* mkbootimg(void* kernel, int64_t kernel_size, off_t kernel_offset,

fastboot/fastboot.cpp

+4 −1
Original line number Diff line number Diff line
@@ -447,8 +447,11 @@ static void* load_bootable_image(const std::string& kernel, const std::string& r 
    if (kdata == nullptr) die("cannot load '%s': %s", kernel.c_str(), strerror(errno));



    // Is this actually a boot image?

    if (ksize < static_cast<int64_t>(sizeof(boot_img_hdr))) {

        die("cannot load '%s': too short", kernel.c_str());

    }

    if (!memcmp(kdata, BOOT_MAGIC, BOOT_MAGIC_SIZE)) {

        if (cmdline) bootimg_set_cmdline((boot_img_hdr*) kdata, cmdline);

        if (cmdline) bootimg_set_cmdline(reinterpret_cast<boot_img_hdr*>(kdata), cmdline);



        if (!ramdisk.empty()) die("cannot boot a boot.img *and* ramdisk");