MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support non standard image headers

Browse Source 
Some Samsung device uses the header version field as extra section size
This commit is contained in:
John Wu 2019-07-04 11:09:17 -07:00
parent 085ea6d0a1
commit 8e348a11c2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
signing/src/main/java/com/topjohnwu/signing/SignBoot.java
View File

@ -162,8 +162,8 @@ public class SignBoot {
+ ((kernelSize + pageSize - 1) / pageSize) * pageSize + ((kernelSize + pageSize - 1) / pageSize) * pageSize
+ ((ramdskSize + pageSize - 1) / pageSize) * pageSize + ((ramdskSize + pageSize - 1) / pageSize) * pageSize
+ ((secondSize + pageSize - 1) / pageSize) * pageSize; + ((secondSize + pageSize - 1) / pageSize) * pageSize;
int headerVersion = image.getInt(); // boot image header version int headerVersion = image.getInt(); // boot image header version or extra size
if (headerVersion > 0) { if (headerVersion > 0 && headerVersion < 4) {
image.position(BOOT_IMAGE_HEADER_V1_RECOVERY_DTBO_SIZE_OFFSET); image.position(BOOT_IMAGE_HEADER_V1_RECOVERY_DTBO_SIZE_OFFSET);
int recoveryDtboLength = image.getInt(); int recoveryDtboLength = image.getInt();
length += ((recoveryDtboLength + pageSize - 1) / pageSize) * pageSize; length += ((recoveryDtboLength + pageSize - 1) / pageSize) * pageSize;
@ -179,6 +179,9 @@ public class SignBoot {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Invalid image header: invalid header length"); "Invalid image header: invalid header length");
} }
} else {
// headerVersion is 0 or actually extra size in this case
length += ((headerVersion + pageSize - 1) / pageSize) * pageSize;
} }
length = ((length + pageSize - 1) / pageSize) * pageSize; length = ((length + pageSize - 1) / pageSize) * pageSize;
if (length <= 0) { if (length <= 0) {