bmax121 · bmax121 · Apr 8, 2024 · Apr 8, 2024 · Apr 9, 2024 · May 1, 2024
diff --git a/.clang-format b/.clang-format
@@ -51,7 +51,7 @@ BreakConstructorInitializersBeforeComma: false
 BreakConstructorInitializers: BeforeComma
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
-BreakBeforeSemicolons: None
+# BreakBeforeSemicolons: None
 ColumnLimit: 120
 CommentPragmas: "^ IWYU pragma:"
 CompactNamespaces: false

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,16 +38,19 @@ jobs:
       - name: Build kpimg
         run: |
           export TARGET_COMPILE=`pwd`/arm-gnu-toolchain-12.2.rel1-x86_64-aarch64-none-elf/bin/aarch64-none-elf-
-
           cd kernel
-          make
-          mv kpimg kpimg-linux
-          mv kpimg.elf kpimg.elf-linux
-          make clean
+
           export ANDROID=1
           make
           mv kpimg kpimg-android
           mv kpimg.elf kpimg.elf-android
+          make clean
+
+          unset ANDROID
+          make
+          mv kpimg kpimg-linux
+          mv kpimg.elf kpimg.elf-linux
+          make clean
 
           cd ..
           cd kpms
@@ -125,7 +128,7 @@ jobs:
           replacesArtifacts: true
           omitBodyDuringUpdate: true
 
-  Build-android-kpatch-kptools:
+  Build-android-kptools:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -149,7 +152,7 @@ jobs:
         uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r25b
+          ndk-version: r26b
           add-to-path: true
 
       - name: Make hdr
@@ -158,21 +161,6 @@ jobs:
           cd kernel
           make hdr
 
-      - name: Build kpatch-android
-        run: |
-          cd user
-          export ANDROID=1
-          mkdir -p build/android && cd build/android
-          echo ${{ steps.setup-ndk.outputs.ndk-path }}
-          cmake \
-            -DCMAKE_TOOLCHAIN_FILE=${{ steps.setup-ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DANDROID_PLATFORM=android-33 \
-            -DANDROID_ABI=arm64-v8a ../..
-          cmake --build .
-          unset ANDROID
-          mv kpatch kpatch-android
-
       - name: Build kptools-android
         run: |
           cd tools
@@ -192,8 +180,6 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ steps.parse_version.outputs.VERSION }}
           artifacts: |
-            user/build/android/kpatch-android
-            user/build/android/libapjni.so
             tools/build/android/kptools-android
           allowUpdates: true
           replacesArtifacts: true
@@ -267,6 +253,7 @@ jobs:
           install: >-
             msys/make
             msys/gcc
+            msys/zlib-devel
       - name: Copyfile
         shell: pwsh
         run: |
@@ -283,8 +270,11 @@ jobs:
       - name: Copyfile2
         shell: pwsh
         run: |
-          cp .\tools\kptools.exe .\tools\kptools-msys2.exe
-          7z a kptools-msys2-win .\tools\kptools-msys2.exe D:\a\_temp\msys64\usr\bin\msys-2.0.dll
+          mkdir .\win
+          cp .\tools\kptools.exe .\win\kptools-msys2.exe
+          cp D:\a\_temp\msys64\usr\bin\msys-2.0.dll .\win
+          cp D:\a\_temp\msys64\usr\bin\msys-z.dll .\win
+          7z a kptools-msys2-win .\win 
       - name: Release
         uses: ncipollo/[email protected]
         with:
@@ -295,53 +285,6 @@ jobs:
           allowUpdates: true
           replacesArtifacts: true
 
-  Build-kptools-windows-llvm:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Check out
-        uses: actions/checkout@v3
-      - name: Install mingw32 cross toolchains
-        run: |
-          MINGW_LLVM_URL="https://github.com/mstorsjo/llvm-mingw/releases/download/20231128/llvm-mingw-20231128-msvcrt-ubuntu-20.04-x86_64.tar.xz"
-          mkdir -p $HOME/mingw-llvm
-          wget $MINGW_LLVM_URL -O $HOME/mingw-llvm/llvm.tar.xz
-          cd $HOME/mingw-llvm
-          tar -xvf llvm.tar.xz --strip-components 1
-      - name: Generate version
-        id: parse_version
-        run: |
-          MAJOR=$(grep '#define MAJOR' version | awk '{print $3}')
-          MINOR=$(grep '#define MINOR' version | awk '{print $3}')
-          PATCH=$(grep '#define PATCH' version | awk '{print $3}')
-          VERSION="$MAJOR.$MINOR.$PATCH"
-          echo "Generated Version: $VERSION"
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
-      - name: Build kptools
-        run: |
-          export PATH="$HOME/mingw-llvm/bin:$PATH"
-          export ANDROID=1
-          ABIS="x86_64 i686 aarch64 armv7"
-          for i in $ABIS; do
-          make -C kernel hdr TARGET_COMPILE=placeholder
-          echo "- Compiling kptools-$i-win.exe"
-          make -C tools CC=$i-w64-mingw32-clang
-          mv tools/kptools.exe kptools-$i-win.exe
-          make -C tools clean
-          done
-          7za a kptools-llvm-win.zip -tZIP *.exe
-      - name: Release
-        uses: ncipollo/[email protected]
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ steps.parse_version.outputs.VERSION }}
-          artifacts: |
-            kptools-llvm-win.zip
-          allowUpdates: true
-          replacesArtifacts: true
-          omitBodyDuringUpdate: true
-
   Build-kptools-mac:
     runs-on: macos-latest
     permissions:

diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
@@ -4,15 +4,15 @@ on:
   push:
     branches: ["dev"]
     paths:
-      - ".github/workflows/build.yml"
+      - ".github/workflows/build_dev.yml"
       - "kernel/**"
       - "user/**"
       - "tools/**"
       - "version"
   pull_request:
     branches: ["dev"]
     paths:
-      - ".github/workflows/build.yml"
+      - ".github/workflows/build_dev.yml"
       - "kernel/**"
       - "user/**"
       - "tools/**"
@@ -48,14 +48,18 @@ jobs:
         run: |
           export TARGET_COMPILE=`pwd`/arm-gnu-toolchain-12.2.rel1-x86_64-aarch64-none-elf/bin/aarch64-none-elf-
           cd kernel
-          make
-          mv kpimg kpimg-linux
-          mv kpimg.elf kpimg.elf-linux
-          make clean
+
           export ANDROID=1
           make
           mv kpimg kpimg-android
           mv kpimg.elf kpimg.elf-android
+          make clean
+
+          unset ANDROID
+          make
+          mv kpimg kpimg-linux
+          mv kpimg.elf kpimg.elf-linux
+          make clean
 
           cd ..
           cd kpms
@@ -85,7 +89,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ steps.parse_version.outputs.VERSION }}-dev
-          commit: dev
           artifacts: |
             kernel/kpimg-linux
             kernel/kpimg-android
@@ -127,14 +130,13 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ steps.parse_version.outputs.VERSION }}-dev
-          commit: dev
           artifacts: |
             kpuser.zip
           allowUpdates: true
           replacesArtifacts: true
           prerelease: true
 
-  Build-android-kpatch-kptools:
+  Build-android-kptools:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -158,7 +160,7 @@ jobs:
         uses: nttld/setup-ndk@v1
         id: setup-ndk
         with:
-          ndk-version: r25b
+          ndk-version: r26b
           add-to-path: true
 
       - name: Make hdr
@@ -167,21 +169,6 @@ jobs:
           cd kernel
           make hdr
 
-      - name: Build kpatch-android
-        run: |
-          cd user
-          export ANDROID=1
-          mkdir -p build/android && cd build/android
-          echo ${{ steps.setup-ndk.outputs.ndk-path }}
-          cmake \
-            -DCMAKE_TOOLCHAIN_FILE=${{ steps.setup-ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DANDROID_PLATFORM=android-33 \
-            -DANDROID_ABI=arm64-v8a ../..
-          cmake --build .
-          unset ANDROID
-          mv kpatch kpatch-android
-
       - name: Build kptools-android
         run: |
           cd tools
@@ -200,10 +187,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ steps.parse_version.outputs.VERSION }}-dev
-          commit: dev
           artifacts: |
-            user/build/android/kpatch-android
-            user/build/android/libapjni.so
             tools/build/android/kptools-android
           allowUpdates: true
           replacesArtifacts: true
@@ -246,7 +230,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ steps.parse_version.outputs.VERSION }}-dev
-          commit: dev
           artifacts: |
             tools/build/kptools-linux
           allowUpdates: true
@@ -289,7 +272,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ steps.parse_version.outputs.VERSION }}-dev
-          commit: dev
           artifacts: |
             tools/build/kptools-mac
           allowUpdates: true

diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,4 @@
 build
 
 test
-.test
-
+script
diff --git a/README.md b/README.md
@@ -26,8 +26,7 @@ CONFIG_KALLSYMS=y
 
 Currently only supports arm64 architecture.  
 
-Linux 3.18 - 6.2 (theoretically)  
-Linux 6.3+ (not yet adapted)  
+Linux 3.18 - 6.6 (theoretically)  
 
 ## Get Involved
 

diff --git a/doc/.gitignore b/doc/.gitignore
@@ -0,0 +1 @@
+api
diff --git a/doc/en/super-command.md b/doc/en/super-command.md
@@ -0,0 +1,3 @@
+# Super Command
+
+truncate SUPERKEY help
diff --git a/doxyfile b/doxyfile
@@ -0,0 +1,18 @@
+PROJECT_NAME = "KernelPatch Document"
+OUTPUT_DIRECTORY = ./doc/api
+
+INPUT = \
+	./user/supercall.h \
+	./kernel/include/hook.h \
+	./kernel/patch/include/accctl.h \
+	./kernel/patch/include/taskext.h \
+	./kernel/patch/include/uapi/scdefs.h \
+
+FILE_PATTERNS = *.h *.md
+
+RECURSIVE = YES
+GENERATE_LATEX = NO
+SOURCE_BROWSER = YES
+EXTRACT_ALL = YES
+EXTRACT_PRIVATE = YES
+EXTRACT_STATIC = YES
diff --git a/kernel/Makefile b/kernel/Makefile
@@ -68,8 +68,9 @@ ${TARGET}.elf: ${OBJS}
 
 .PHONY: hdr
 hdr:
-	cp -Rf patch/include/uapi ../user
-	cp -f include/preset.h ../tools
+	cp -Rf patch/include/uapi ../user/
+	cp -f ../version ../user/
+	cp -f include/preset.h ../tools/
 
 .PHONY: clean
 clean:

diff --git a/kernel/base/baselib.c b/kernel/base/baselib.c
@@ -244,7 +244,7 @@ char *lib_strncat(char *dst, const char *src, size_t n)
         *q++ = ch = *p++;
         if (!ch) return dst;
     }
-    *q = '\0';
+    // *q = '\0';
     return dst;
 }
 
@@ -277,7 +277,7 @@ char *lib_strncpy(char *dst, const char *src, size_t n)
         *q++ = ch = *p++;
         if (!ch) break;
     }
-    *q = '\0';
+    // *q = '\0';
     return dst;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,5 +6,4 @@ @@
     build
     test
-    .test
+    script