Fix MKSU susfs patch: Use additional patch

cctv18 · cctv18 · commit 947279b4e640 · 2025-11-18T02:31:34.000+08:00
diff --git a/.github/workflows/fastbuild_6.6.30.yml b/.github/workflows/fastbuild_6.6.30.yml
@@ -307,10 +307,10 @@ jobs:
             cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
             cp ./SukiSU_patch/69_hide_stuff.patch ./common/
             cd ./KernelSU
-            #为MKSU修正susfs 2.0.0补丁
-            perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-            sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
             patch -p1 < 10_enable_susfs_for_ksu.patch || true
+            #为MKSU修正susfs 2.0.0补丁
+            wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+            patch -p1 < mksu_supercalls.patch || true
             wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
             patch -p1 < fix_umount.patch || true
             cd ../common
diff --git a/.github/workflows/fastbuild_6.6.50.yml b/.github/workflows/fastbuild_6.6.50.yml
@@ -307,10 +307,10 @@ jobs:
             cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
             cp ./SukiSU_patch/69_hide_stuff.patch ./common/
             cd ./KernelSU
-            #为MKSU修正susfs 2.0.0补丁
-            perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-            sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
             patch -p1 < 10_enable_susfs_for_ksu.patch || true
+            #为MKSU修正susfs 2.0.0补丁
+            wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+            patch -p1 < mksu_supercalls.patch || true
             wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
             patch -p1 < fix_umount.patch || true
             cd ../common
diff --git a/.github/workflows/fastbuild_6.6.56.yml b/.github/workflows/fastbuild_6.6.56.yml
@@ -307,10 +307,10 @@ jobs:
             cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
             cp ./SukiSU_patch/69_hide_stuff.patch ./common/
             cd ./KernelSU
-            #为MKSU修正susfs 2.0.0补丁
-            perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-            sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
             patch -p1 < 10_enable_susfs_for_ksu.patch || true
+            #为MKSU修正susfs 2.0.0补丁
+            wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+            patch -p1 < mksu_supercalls.patch || true
             wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
             patch -p1 < fix_umount.patch || true
             cd ../common
diff --git a/.github/workflows/fastbuild_6.6.57.yml b/.github/workflows/fastbuild_6.6.57.yml
@@ -307,10 +307,10 @@ jobs:
             cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
             cp ./SukiSU_patch/69_hide_stuff.patch ./common/
             cd ./KernelSU
-            #为MKSU修正susfs 2.0.0补丁
-            perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-            sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
             patch -p1 < 10_enable_susfs_for_ksu.patch || true
+            #为MKSU修正susfs 2.0.0补丁
+            wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+            patch -p1 < mksu_supercalls.patch || true
             wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
             patch -p1 < fix_umount.patch || true
             cd ../common
diff --git a/.github/workflows/fastbuild_6.6.66.yml b/.github/workflows/fastbuild_6.6.66.yml
@@ -303,10 +303,10 @@ jobs:
             cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
             cp ./SukiSU_patch/69_hide_stuff.patch ./common/
             cd ./KernelSU
-            #为MKSU修正susfs 2.0.0补丁
-            perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-            sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
             patch -p1 < 10_enable_susfs_for_ksu.patch || true
+            #为MKSU修正susfs 2.0.0补丁
+            wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+            patch -p1 < mksu_supercalls.patch || true
             wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
             patch -p1 < fix_umount.patch || true
             cd ../common
diff --git a/.github/workflows/fastbuild_6.6.89.yml b/.github/workflows/fastbuild_6.6.89.yml
@@ -303,10 +303,10 @@ jobs:
             cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
             cp ./SukiSU_patch/69_hide_stuff.patch ./common/
             cd ./KernelSU
-            #为MKSU修正susfs 2.0.0补丁
-            perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-            sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
             patch -p1 < 10_enable_susfs_for_ksu.patch || true
+            #为MKSU修正susfs 2.0.0补丁
+            wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+            patch -p1 < mksu_supercalls.patch || true
             wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
             patch -p1 < fix_umount.patch || true
             cd ../common
diff --git a/local/builder_6.6.30.sh b/local/builder_6.6.30.sh
@@ -170,10 +170,10 @@ elif [[ "$KSU_BRANCH" == "m" || "$KSU_BRANCH" == "M" ]]; then
   cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
   cp ./SukiSU_patch/69_hide_stuff.patch ./common/
   cd ./KernelSU
-  #为MKSU修正susfs 2.0.0补丁
-  perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-  sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
   patch -p1 < 10_enable_susfs_for_ksu.patch || true
+  #为MKSU修正susfs 2.0.0补丁
+  wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+  patch -p1 < mksu_supercalls.patch || true
   wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
   patch -p1 < fix_umount.patch || true
   cd ../common
diff --git a/local/builder_6.6.50.sh b/local/builder_6.6.50.sh
@@ -170,10 +170,10 @@ elif [[ "$KSU_BRANCH" == "m" || "$KSU_BRANCH" == "M" ]]; then
   cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
   cp ./SukiSU_patch/69_hide_stuff.patch ./common/
   cd ./KernelSU
-  #为MKSU修正susfs 2.0.0补丁
-  perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-  sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
   patch -p1 < 10_enable_susfs_for_ksu.patch || true
+  #为MKSU修正susfs 2.0.0补丁
+  wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+  patch -p1 < mksu_supercalls.patch || true
   wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
   patch -p1 < fix_umount.patch || true
   cd ../common
diff --git a/local/builder_6.6.56.sh b/local/builder_6.6.56.sh
@@ -170,10 +170,10 @@ elif [[ "$KSU_BRANCH" == "m" || "$KSU_BRANCH" == "M" ]]; then
   cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
   cp ./SukiSU_patch/69_hide_stuff.patch ./common/
   cd ./KernelSU
-  #为MKSU修正susfs 2.0.0补丁
-  perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-  sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
   patch -p1 < 10_enable_susfs_for_ksu.patch || true
+  #为MKSU修正susfs 2.0.0补丁
+  wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+  patch -p1 < mksu_supercalls.patch || true
   wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
   patch -p1 < fix_umount.patch || true
   cd ../common
diff --git a/local/builder_6.6.57.sh b/local/builder_6.6.57.sh
@@ -170,10 +170,10 @@ elif [[ "$KSU_BRANCH" == "m" || "$KSU_BRANCH" == "M" ]]; then
   cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
   cp ./SukiSU_patch/69_hide_stuff.patch ./common/
   cd ./KernelSU
-  #为MKSU修正susfs 2.0.0补丁
-  perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-  sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
   patch -p1 < 10_enable_susfs_for_ksu.patch || true
+  #为MKSU修正susfs 2.0.0补丁
+  wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+  patch -p1 < mksu_supercalls.patch || true
   wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
   patch -p1 < fix_umount.patch || true
   cd ../common
diff --git a/local/builder_6.6.66.sh b/local/builder_6.6.66.sh
@@ -166,10 +166,10 @@ elif [[ "$KSU_BRANCH" == "m" || "$KSU_BRANCH" == "M" ]]; then
   cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
   cp ./SukiSU_patch/69_hide_stuff.patch ./common/
   cd ./KernelSU
-  #为MKSU修正susfs 2.0.0补丁
-  perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-  sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
   patch -p1 < 10_enable_susfs_for_ksu.patch || true
+  #为MKSU修正susfs 2.0.0补丁
+  wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+  patch -p1 < mksu_supercalls.patch || true
   wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
   patch -p1 < fix_umount.patch || true
   cd ../common
diff --git a/local/builder_6.6.89.sh b/local/builder_6.6.89.sh
@@ -166,10 +166,10 @@ elif [[ "$KSU_BRANCH" == "m" || "$KSU_BRANCH" == "M" ]]; then
   cp ./susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
   cp ./SukiSU_patch/69_hide_stuff.patch ./common/
   cd ./KernelSU
-  #为MKSU修正susfs 2.0.0补丁
-  perl -i -pe 'if (/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/) { $line_cache = $_; $n2=$2; $n4=$4; $_ = <>; if ($_ eq " #include <linux/task_work.h>\n") { $n2++; $n4++; $line_cache =~ s/^(@@ -[0-9]+,)([0-9]+)( \+[0-9]+,)([0-9]+)( @@)/$1$n2$3$n4$5/; } print $line_cache; }' 10_enable_susfs_for_ksu.patch
-  sed -i '/ #include <linux\/uaccess\.h>/ { N; s| #include <linux/uaccess\.h>\n #include <linux/version\.h>|&\n #include <linux/pid.h>| }' 10_enable_susfs_for_ksu.patch
   patch -p1 < 10_enable_susfs_for_ksu.patch || true
+  #为MKSU修正susfs 2.0.0补丁
+  wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/mksu_supercalls.patch
+  patch -p1 < mksu_supercalls.patch || true
   wget https://github.com/cctv18/oppo_oplus_realme_sm8750/raw/refs/heads/main/other_patch/fix_umount.patch
   patch -p1 < fix_umount.patch || true
   cd ../common
diff --git a/other_patch/mksu_supercalls.patch b/other_patch/mksu_supercalls.patch
@@ -0,0 +1,13 @@
+--- a/kernel/supercalls.c	2025-11-18 02:12:46.029786324 +0800
++++ b/kernel/supercalls.c	2025-11-18 02:14:38.979883601 +0800
+@@ -14,6 +14,10 @@
+ #include <linux/uaccess.h>
+ #include <linux/version.h>
+ #include <linux/pid.h>
++#ifdef CONFIG_KSU_SUSFS
++#include <linux/namei.h>
++#include <linux/susfs.h>
++#endif // #ifdef CONFIG_KSU_SUSFS
+ 
+ #include "arch.h"
+ #include "allowlist.h"
