susfs: merged latest commit.
Commit:8e8150bf1ede64f310240e19a05277Co-authored-by: JackAltman <82563979+JackA1ltman@users.noreply.github.com>
This commit is contained in:
@@ -75,9 +75,6 @@ extern void susfs_run_sus_path_loop(uid_t uid);
|
|||||||
#ifdef CONFIG_KSU_SUSFS_ENABLE_LOG
|
#ifdef CONFIG_KSU_SUSFS_ENABLE_LOG
|
||||||
extern bool susfs_is_log_enabled __read_mostly;
|
extern bool susfs_is_log_enabled __read_mostly;
|
||||||
#endif // #ifdef CONFIG_KSU_SUSFS_ENABLE_LOG
|
#endif // #ifdef CONFIG_KSU_SUSFS_ENABLE_LOG
|
||||||
#ifdef CONFIG_KSU_SUSFS_TRY_UMOUNT
|
|
||||||
extern void susfs_run_try_umount_for_current_mnt_ns(void);
|
|
||||||
#endif // #ifdef CONFIG_KSU_SUSFS_TRY_UMOUNT
|
|
||||||
#ifdef CONFIG_KSU_SUSFS_SUS_MOUNT
|
#ifdef CONFIG_KSU_SUSFS_SUS_MOUNT
|
||||||
static bool susfs_is_umount_for_zygote_system_process_enabled = false;
|
static bool susfs_is_umount_for_zygote_system_process_enabled = false;
|
||||||
static bool susfs_is_umount_for_zygote_iso_service_enabled = false;
|
static bool susfs_is_umount_for_zygote_iso_service_enabled = false;
|
||||||
@@ -763,18 +760,6 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
|
|||||||
pr_info("susfs: copy_to_user() failed\n");
|
pr_info("susfs: copy_to_user() failed\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (arg2 == CMD_SUSFS_UMOUNT_FOR_ZYGOTE_ISO_SERVICE) {
|
|
||||||
int error = 0;
|
|
||||||
if (arg3 != 0 && arg3 != 1) {
|
|
||||||
pr_err("susfs: CMD_SUSFS_UMOUNT_FOR_ZYGOTE_ISO_SERVICE -> arg3 can only be 0 or 1\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
susfs_is_umount_for_zygote_iso_service_enabled = arg3;
|
|
||||||
pr_info("susfs: CMD_SUSFS_UMOUNT_FOR_ZYGOTE_ISO_SERVICE -> susfs_is_umount_for_zygote_iso_service_enabled: %lu\n", arg3);
|
|
||||||
if (copy_to_user((void __user*)arg5, &error, sizeof(error)))
|
|
||||||
pr_info("susfs: copy_to_user() failed\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif //#ifdef CONFIG_KSU_SUSFS_SUS_MOUNT
|
#endif //#ifdef CONFIG_KSU_SUSFS_SUS_MOUNT
|
||||||
#ifdef CONFIG_KSU_SUSFS_SUS_KSTAT
|
#ifdef CONFIG_KSU_SUSFS_SUS_KSTAT
|
||||||
if (arg2 == CMD_SUSFS_ADD_SUS_KSTAT) {
|
if (arg2 == CMD_SUSFS_ADD_SUS_KSTAT) {
|
||||||
@@ -843,11 +828,6 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
|
|||||||
pr_info("susfs: copy_to_user() failed\n");
|
pr_info("susfs: copy_to_user() failed\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (arg2 == CMD_SUSFS_RUN_UMOUNT_FOR_CURRENT_MNT_NS) {
|
|
||||||
int error = 0;
|
|
||||||
susfs_run_try_umount_for_current_mnt_ns();
|
|
||||||
pr_info("susfs: CMD_SUSFS_RUN_UMOUNT_FOR_CURRENT_MNT_NS -> ret: %d\n", error);
|
|
||||||
}
|
|
||||||
#endif //#ifdef CONFIG_KSU_SUSFS_TRY_UMOUNT
|
#endif //#ifdef CONFIG_KSU_SUSFS_TRY_UMOUNT
|
||||||
#ifdef CONFIG_KSU_SUSFS_SPOOF_UNAME
|
#ifdef CONFIG_KSU_SUSFS_SPOOF_UNAME
|
||||||
if (arg2 == CMD_SUSFS_SET_UNAME) {
|
if (arg2 == CMD_SUSFS_SET_UNAME) {
|
||||||
|
|||||||
Reference in New Issue
Block a user