openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix fastboot memory corruption."

This commit is contained in:
Treehugger Robot 2018-01-19 22:39:14 +00:00 committed by Gerrit Code Review
parent 0f2ed7d398 aaa3b6bbf2
commit b6d7f2655d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fastboot/bootimg_utils.cpp
View File

@ -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,

5
fastboot/fastboot.cpp
View File

@ -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");