fixed some bugs and optimized the CI process

.gitignore

@@ -28,6 +28,10 @@ extracted/
 # VS Code
 .vscode/
 
+# dist dic itself, not only .elf files
+dist/
+targets/*/build
+
 submodules/uefi/edk2/build_modulepkg.log
 
 submodules/unsigned_abl.elf

Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:22.04
-
+LABEL org.opencontainers.image.title="gbl_builder"
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y \

Makefile

@@ -1,15 +1,9 @@
-submodule_uefi_clean:
-	cd submodules/uefi && make clean
 submodule_patcher_clean:
 	cd submodules/patcher && make clean
-submodule_elflinker_clean:
-	cd submodules/elflinker && make clean
 submodule_ablfvextractor_clean:
 	cd submodules/ablfvextractor && make clean
 clean_submodules: submodule_uefi_clean submodule_patcher_clean submodule_elflinker_clean submodule_ablfvextractor_clean
 
-target_generic_efi_clean: 
-	cd targets/generic_efi && make clean
 target_toolkit_windows_clean:
 	cd targets/toolkit_windows && make clean
 target_toolkit_linux_clean:
@@ -20,8 +14,6 @@ targets_clean: clean_submodules target_generic_efi_clean target_toolkit_windows_
 
 clean: targets_clean clean_submodules
 
-target_generic_efi:
-	cd targets/generic_efi && make build
 target_toolkit_windows:
 	cd targets/toolkit_windows && make build 
 target_toolkit_linux:

docker-compose.yml

@@ -0,0 +1,10 @@
+services:
+  abl-builder:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: gbl_builder:latest
+    volumes:
+      - .:/workspace
+    command: >
+      bash -c "make clean && make build && make build_module"

docker_build.sh

@@ -0,0 +1,2 @@
+docker build -t gbl_builder:latest .
+docker image prune -f --filter label=org.opencontainers.image.title="gbl_builder"

submodules/README.md

@@ -1,10 +1,6 @@
 ### Submodules
 dependences of the project
-# uefi
-superfastboot, for better testing
 # ablfvextractor
 extract abl
-# elflinker
-links abl with superfb
 # patcher
 core patching engine

submodules/patcher/src/patchs/core.c

@@ -131,7 +131,7 @@ int32_t patch_adrl_unlocked_to_locked(char* buffer, int32_t size, uint64_t load_
         if (!str_at(buffer, size, off0, "unlocked")) continue;
         if (!str_at(buffer, size, off1, "locked"))   continue;
         bool match = false;
-        for(int j=i+16; j<=i+40;j+=4){
+        for(int j=i+16; j<=i+40 && j<=size-8;j+=4){
             DecodedInst c0 = decode_at(buffer, j);
             DecodedInst c1 = decode_at(buffer, j + 4);
             if(c0.type == INST_ADRP && c1.type == INST_ADD_X_IMM){
@@ -191,7 +191,8 @@ bool PatchBuffer(char* data, int32_t size) {
     int32_t num_patches = patch_abl_bootstate(data, size, &lock_register_num, &offset);
     if (num_patches == 0) {
         printf("Error: Failed to find/patch ABL Boot State\n");
-        free(data);
+        // free(data);
+        // caller is patch_abl.c, which has freed already. free there would cause double free. NCC, 2026-06-30
         return 0;
     }
     printf("Anchor offset : 0x%X\n", offset);