From d6c2c821a479496a0f5cfe7c143b3026d1a00a8a Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Mon, 7 Oct 2019 22:57:01 -0400 Subject: [PATCH] Minor improvements in QCDT logic --- native/jni/magiskboot/dtb.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/native/jni/magiskboot/dtb.cpp b/native/jni/magiskboot/dtb.cpp index aa7884264..b1a009538 100644 --- a/native/jni/magiskboot/dtb.cpp +++ b/native/jni/magiskboot/dtb.cpp @@ -223,11 +223,12 @@ static int dtb_patch(const qcdt_hdr *hdr, const char *in, const char *out) { // Collect all dtbs for (int i = 0; i < hdr->num_dtbs; ++i) { - auto it = dtb_map.find(tables[i].offset); - if (it == dtb_map.end()) { - auto fdt = xmalloc(tables[i].len + 256); - memcpy(fdt, buf + tables[i].offset, tables[i].len); - fdt_open_into(fdt, fdt, tables[i].len + 256); + if (dtb_map.find(tables[i].offset) == dtb_map.end()) { + auto blob = buf + tables[i].offset; + int size = fdt_totalsize(blob); + auto fdt = xmalloc(size + 256); + memcpy(fdt, blob, size); + fdt_open_into(fdt, fdt, size + 256); dtb_map[tables[i].offset] = { fdt, tables[i].offset }; } } @@ -257,16 +258,15 @@ static int dtb_patch(const qcdt_hdr *hdr, const char *in, const char *out) { // Write dtbs for (auto &val : dtb_map) { - write_zero(fd, align_off(lseek(fd, 0, SEEK_CUR), page_size)); val.second.offset = lseek(fd, 0, SEEK_CUR); auto fdt = val.second.fdt; fdt_pack(fdt); int size = fdt_totalsize(fdt); xwrite(fd, fdt, size); val.second.len = do_align(size, page_size); + write_zero(fd, align_off(lseek(fd, 0, SEEK_CUR), page_size)); free(fdt); } - write_zero(fd, align_off(lseek(fd, 0, SEEK_CUR), page_size)); // Patch tables auto tables_rw = reinterpret_cast(addr + sizeof(qcdt_hdr));