fix magiskboot error,try support kernel 6.12 patch

Author: Admirepowered

.github/workflows/build.yml

@@ -35,6 +35,9 @@ jobs:
       - name: Build resetprop
         run: ./build.py -vr native resetprop
 
+      - name: Build magiskboot
+        run: ./build.py -vr native magiskboot
+
       - name: Stop gradle daemon
         run: ./app/gradlew --stop
 

native/src/boot/bootimg.cpp

@@ -272,8 +272,8 @@ struct [[gnu::packed]] fdt_header {
 static int find_dtb_offset(const uint8_t *buf, unsigned sz) {
     const uint8_t * const end = buf + sz;
 
-    for (auto curr = buf; curr < end; curr += sizeof(fdt_header)) {
-        curr = static_cast<uint8_t*>(memmem(curr, end - curr, DTB_MAGIC, sizeof(fdt_header::fdt32_t)));
+    for (auto curr = buf; curr < end; curr += sizeof(fdt_header)+2) {
+        curr = static_cast<uint8_t*>(memmem(curr, end - curr, DTB_MAGIC, sizeof(fdt_header::fdt32_t)+2));
         if (curr == nullptr)
             return -1;
 

native/src/boot/magiskboot.hpp

@@ -30,7 +30,7 @@
 #define LZ41_MAGIC      "\x03\x21\x4c\x18"
 #define LZ42_MAGIC      "\x04\x22\x4d\x18"
 #define MTK_MAGIC       "\x88\x16\x88\x58"
-#define DTB_MAGIC       "\xd0\x0d\xfe\xed"
+#define DTB_MAGIC       "\xd0\x0d\xfe\xed\x00\x05"
 #define LG_BUMP_MAGIC   "\x41\xa9\xe4\x67\x74\x4d\x1d\x1b\xa4\x29\xf2\xec\xea\x65\x52\x79"
 #define DHTB_MAGIC      "\x44\x48\x54\x42\x01\x00\x00\x00"
 #define SEANDROID_MAGIC "SEANDROIDENFORCE"