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

Support zImage compression types other than gzip.

Browse Source 
Instead of just searching for the gzip magic, it now incrementally searches the kernel for the first thing that `check_fmt_lg` doesn't report as `UNKNOWN`.
This commit is contained in:
David K. 2025-01-30 20:15:38 -05:00 committed by John Wu
parent 893821ad88
commit 0e82df9e10
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
native/src/boot/bootimg.cpp
View File

@ -431,9 +431,20 @@ bool boot_img::parse_image(const uint8_t *p, format_t type) {
} }
if (k_fmt == ZIMAGE) { if (k_fmt == ZIMAGE) {
z_hdr = reinterpret_cast<const zimage_hdr *>(kernel); z_hdr = reinterpret_cast<const zimage_hdr *>(kernel);
if (const void *gzip = memmem(kernel, hdr->kernel_size(), GZIP1_MAGIC "\x08\x00", 4)) {
const uint8_t* found_pos = 0;
for (const uint8_t* search_pos = kernel + 0x28; search_pos < kernel + hdr->kernel_size(); search_pos++) {
// ^^^^^^ +0x28 to search after zimage header and magic
if (check_fmt_lg(search_pos, hdr->kernel_size() - (search_pos - kernel)) != UNKNOWN) {
found_pos = search_pos;
search_pos = kernel + hdr->kernel_size();
}
}
if (found_pos != 0) {
fprintf(stderr, "ZIMAGE_KERNEL\n"); fprintf(stderr, "ZIMAGE_KERNEL\n");
z_info.hdr_sz = (const uint8_t *) gzip - kernel; z_info.hdr_sz = (const uint8_t *) found_pos - kernel;
// Find end of piggy // Find end of piggy
uint32_t zImage_size = z_hdr->end - z_hdr->start; uint32_t zImage_size = z_hdr->end - z_hdr->start;
@ -457,7 +468,7 @@ bool boot_img::parse_image(const uint8_t *p, 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 piggy, keeping raw kernel\n"); fprintf(stderr, "! Could not find zImage piggy, keeping raw kernel\n");
} }
} }
fprintf(stderr, "%-*s [%s]\n", PADDING, "KERNEL_FMT", fmt2name[k_fmt]); fprintf(stderr, "%-*s [%s]\n", PADDING, "KERNEL_FMT", fmt2name[k_fmt]);