TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-25 02:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly support v4 image headers

Browse Source
This commit is contained in:
topjohnwu
2021-11-21 05:55:20 -08:00
parent 5787aa1078
commit 632971af15
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
native/jni/magiskboot/bootimg.hpp
View File

@@ -367,6 +367,11 @@ struct dyn_img_hdr {
decl_var(header_size, 32)
decl_var(dtb_size, 32)
// v4 specific
decl_val(signature_size, uint32_t)
decl_val(vendor_ramdisk_table_size, uint32_t)
decl_val(bootconfig_size, uint32_t)
virtual ~dyn_img_hdr() {
free(raw);
}
@@ -495,6 +500,8 @@ struct dyn_img_v3 : public dyn_img_hdr_boot {
struct dyn_img_v4 : public dyn_img_v3 {
impl_cls(v4)
impl_val(signature_size)
};
struct dyn_img_hdr_vendor : public dyn_img_hdr {
@@ -524,6 +531,9 @@ struct dyn_img_vnd_v3 : public dyn_img_hdr_vendor {
struct dyn_img_vnd_v4 : public dyn_img_vnd_v3 {
impl_cls(vnd_v4)
impl_val(vendor_ramdisk_table_size)
impl_val(bootconfig_size)
};
#undef __impl_cls
@@ -610,6 +620,10 @@ struct boot_img {
uint8_t *recovery_dtbo;
uint8_t *dtb;
// Pointer to blocks defined in header, but we do not care
uint8_t *ignore;
size_t ignore_size = 0;
boot_img(const char *);
~boot_img();