TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-01-12 15:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get proper total image size

Browse Source
This commit is contained in:
topjohnwu 2021-01-14 03:55:27 -08:00
parent e8ba671fc2
commit aec06a6f61
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
native/jni/magiskboot/bootimg.cpp
View File

@ -443,6 +443,7 @@ void repack(const char* src_img, const char* out_img, bool skip_comp) {
uint32_t second; uint32_t second;
uint32_t extra; uint32_t extra;
uint32_t dtb; uint32_t dtb;
uint32_t total;
} off; } off;
fprintf(stderr, "Repack to boot image: [%s]\n", out_img); fprintf(stderr, "Repack to boot image: [%s]\n", out_img);
@ -565,11 +566,12 @@ void repack(const char* src_img, const char* out_img, bool skip_comp) {
restore_buf(fd, LG_BUMP_MAGIC, 16); restore_buf(fd, LG_BUMP_MAGIC, 16);
} }
off.total = lseek(fd, 0, SEEK_CUR);
// Pad image to at least original size if not chromeos (as it requires post processing) // Pad image to at least original size if not chromeos (as it requires post processing)
if (!is_flag(CHROMEOS_FLAG)) { if (!is_flag(CHROMEOS_FLAG)) {
auto current_sz = lseek(fd, 0, SEEK_CUR); if (off.total < boot.map_size) {
if (current_sz < boot.map_size) { int padding = boot.map_size - off.total;
int padding = boot.map_size - current_sz;
write_zero(fd, padding); write_zero(fd, padding);
} }
} }
@ -642,11 +644,11 @@ void repack(const char* src_img, const char* out_img, bool skip_comp) {
// DHTB header // DHTB header
auto hdr = reinterpret_cast<dhtb_hdr *>(boot.map_addr); auto hdr = reinterpret_cast<dhtb_hdr *>(boot.map_addr);
memcpy(hdr, DHTB_MAGIC, 8); memcpy(hdr, DHTB_MAGIC, 8);
hdr->size = boot.map_size - sizeof(dhtb_hdr); hdr->size = off.total - sizeof(dhtb_hdr);
SHA256_hash(boot.map_addr + sizeof(dhtb_hdr), hdr->size, hdr->checksum); SHA256_hash(boot.map_addr + sizeof(dhtb_hdr), hdr->size, hdr->checksum);
} else if (is_flag(BLOB_FLAG)) { } else if (is_flag(BLOB_FLAG)) {
// Blob header // Blob header
auto hdr = reinterpret_cast<blob_hdr *>(boot.map_addr); auto hdr = reinterpret_cast<blob_hdr *>(boot.map_addr);
hdr->size = boot.map_size - sizeof(blob_hdr); hdr->size = off.total - sizeof(blob_hdr);
} }
} }