diff --git a/fs/susfs.c b/fs/susfs.c index ce8f78c79..e82962665 100644 --- a/fs/susfs.c +++ b/fs/susfs.c @@ -826,7 +826,7 @@ struct filename* susfs_get_redirected_path(unsigned long ino) { /* sus_su */ #ifdef CONFIG_KSU_SUSFS_SUS_SU bool susfs_is_sus_su_hooks_enabled __read_mostly = false; -static int susfs_sus_su_working_mode = 2; +static int susfs_sus_su_working_mode = 0; extern void ksu_susfs_enable_sus_su(void); extern void ksu_susfs_disable_sus_su(void); diff --git a/include/linux/susfs_def.h b/include/linux/susfs_def.h index 72e285bd7..7442047d0 100644 --- a/include/linux/susfs_def.h +++ b/include/linux/susfs_def.h @@ -28,18 +28,22 @@ #define SUSFS_MAX_LEN_PATHNAME 256 // 256 should address many paths already unless you are doing some strange experimental stuff, then set your own desired length #define SUSFS_FAKE_CMDLINE_OR_BOOTCONFIG_SIZE 4096 -#define TRY_UMOUNT_DEFAULT 0 -#define TRY_UMOUNT_DETACH 1 +#define TRY_UMOUNT_DEFAULT 0 /* used by susfs_try_umount() */ +#define TRY_UMOUNT_DETACH 1 /* used by susfs_try_umount() */ #define SUS_SU_DISABLED 0 #define SUS_SU_WITH_OVERLAY 1 /* deprecated */ #define SUS_SU_WITH_HOOKS 2 +#define DEFAULT_SUS_MNT_ID 100000 /* used by mount->mnt_id */ +#define DEFAULT_SUS_MNT_ID_FOR_KSU_PROC_UNSHARE 1000000 /* used by vfsmount->susfs_mnt_id_backup */ +#define DEFAULT_SUS_MNT_GROUP_ID 1000 /* used by mount->mnt_group_id */ + /* * inode->i_state => storing flag 'INODE_STATE_' - * mount->mnt.susfs_orig_mnt_id => storing original mnt_id + * mount->mnt.susfs_mnt_id_backup => storing original mnt_id of normal mounts or custom sus mnt_id of sus mounts * task_struct->susfs_last_fake_mnt_id => storing last valid fake mnt_id - * task_struct->susfs_task_state => storing flag 'TASK_STRUCT_KABI' + * task_struct->susfs_task_state => storing flag 'TASK_STRUCT_' */ #define INODE_STATE_SUS_PATH BIT(24) @@ -50,6 +54,9 @@ #define TASK_STRUCT_NON_ROOT_USER_APP_PROC BIT(24) #define MAGIC_MOUNT_WORKDIR "/debug_ramdisk/workdir" +#define DATA_ADB_UMOUNT_FOR_ZYGOTE_SYSTEM_PROCESS "/data/adb/susfs_umount_for_zygote_system_process" +#define DATA_ADB_NO_AUTO_ADD_SUS_BIND_MOUNT "/data/adb/susfs_no_auto_add_sus_bind_mount" +#define DATA_ADB_NO_AUTO_ADD_SUS_KSU_DEFAULT_MOUNT "/data/adb/susfs_no_auto_add_sus_ksu_default_mount" +#define DATA_ADB_NO_AUTO_ADD_TRY_UMOUNT_FOR_BIND_MOUNT "/data/adb/susfs_no_auto_add_try_umount_for_bind_mount" - -#endif +#endif // #ifndef KSU_SUSFS_DEF_H