Skip to content

Commit 2881dd4

Browse files
Fix SUSFS namespace static key on 5.15.41
1 parent 0877cec commit 2881dd4

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

.github/workflows/build.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,15 @@ jobs:
10041004
if [[ "$CURRENT_SUB" -le 41 ]]; then
10051005
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a13-5.15/namespace.c.patch ./
10061006
patch -p1 < namespace.c.patch || true
1007+
if [[ "$CURRENT_SUB" -eq 41 ]] && grep -qF 'static_branch_unlikely(&susfs_is_sdcard_android_data_not_decrypted)' ./fs/namespace.c; then
1008+
if grep -qF 'extern bool susfs_is_sdcard_android_data_decrypted __read_mostly;' ./fs/namespace.c \
1009+
&& ! grep -qF 'extern struct static_key_true susfs_is_sdcard_android_data_not_decrypted;' ./fs/namespace.c; then
1010+
sed -i 's/extern bool susfs_is_sdcard_android_data_decrypted __read_mostly;/extern struct static_key_true susfs_is_sdcard_android_data_not_decrypted;/' ./fs/namespace.c
1011+
elif ! grep -qF 'extern struct static_key_true susfs_is_sdcard_android_data_not_decrypted;' ./fs/namespace.c; then
1012+
sed -i '/extern bool susfs_is_current_ksu_domain(void);/a extern struct static_key_true susfs_is_sdcard_android_data_not_decrypted;' ./fs/namespace.c
1013+
fi
1014+
echo "已修复 android13-5.15.41 namespace.c 的 SUSFS sdcard static key 声明"
1015+
fi
10071016
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a13-5.15/fdinfo.c.patch ./
10081017
patch -p1 < fdinfo.c.patch || true
10091018
cp $KERNEL_PATCHES/wild/susfs_fix_patches/v${SUSFS_VERSION}/a13-5.15/open.c.patch ./

0 commit comments

Comments
 (0)