TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-19 06:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use full gzip-signature to find gzip-data.

Browse Source 
Fall back to raw image if gzip is not found.

Fixes #4849
This commit is contained in:
Chaosmaster 2021-11-03 16:42:23 +01:00 committed by John Wu
parent 5682917356
commit 16322ab30c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,7 +335,7 @@ void boot_img::parse_image(uint8_t *addr, format_t type) {
if (k_fmt == ZIMAGE) { if (k_fmt == ZIMAGE) {
z_hdr = reinterpret_cast<zimage_hdr *>(kernel); z_hdr = reinterpret_cast<zimage_hdr *>(kernel);
uint32_t end = z_hdr->end_offset; uint32_t end = z_hdr->end_offset;
if (void *gzip_offset = memmem(kernel, hdr->kernel_size(), GZIP1_MAGIC, 2)) { if (void *gzip_offset = memmem(kernel, hdr->kernel_size(), GZIP1_MAGIC "\x08\x00", 4)) {
fprintf(stderr, "ZIMAGE_KERNEL\n"); fprintf(stderr, "ZIMAGE_KERNEL\n");
z_info.hdr_sz = (uint8_t *) gzip_offset - kernel; z_info.hdr_sz = (uint8_t *) gzip_offset - kernel;
uint8_t *end_addr = kernel + z_hdr->end_offset; uint8_t *end_addr = kernel + z_hdr->end_offset;
@ -347,8 +347,7 @@ void boot_img::parse_image(uint8_t *addr, format_t type) {
} }
} }
if (end == z_hdr->end_offset) { if (end == z_hdr->end_offset) {
fprintf(stderr, "Could not find end of zImage gzip data\n"); fprintf(stderr, "Could not find end of zImage gzip data, keeping raw kernel\n");
exit(1);
} else { } else {
flags[ZIMAGE_KERNEL] = true; flags[ZIMAGE_KERNEL] = true;
z_info.tail = kernel + end; z_info.tail = kernel + end;
@ -358,8 +357,7 @@ void boot_img::parse_image(uint8_t *addr, format_t type) {
k_fmt = check_fmt_lg(kernel, hdr->kernel_size()); k_fmt = check_fmt_lg(kernel, hdr->kernel_size());
} }
} else { } else {
fprintf(stderr, "Could not find zImage gzip data\n"); fprintf(stderr, "Could not find zImage gzip data, keeping raw kernel\n");
exit(1);
} }
} }
fprintf(stderr, "%-*s [%s]\n", PADDING, "KERNEL_FMT", fmt2name[k_fmt]); fprintf(stderr, "%-*s [%s]\n", PADDING, "KERNEL_FMT", fmt2name[k_fmt]);