diff --git a/kernel/apk_sign.c b/kernel/apk_sign.c index 2a51c19f..1f8f8441 100644 --- a/kernel/apk_sign.c +++ b/kernel/apk_sign.c @@ -369,7 +369,7 @@ bool is_manager_apk(char *path) return check_v2_signature(path, false, NULL); } -bool ksu_is_dynamic_manager_apk(char *path, int *signature_index) +bool is_dynamic_manager_apk(char *path, int *signature_index) { return check_v2_signature(path, true, signature_index); } \ No newline at end of file diff --git a/kernel/apk_sign.h b/kernel/apk_sign.h index e8997752..06c44616 100644 --- a/kernel/apk_sign.h +++ b/kernel/apk_sign.h @@ -6,4 +6,6 @@ bool is_manager_apk(char *path); +bool is_dynamic_manager_apk(char *path, int *signature_index); + #endif diff --git a/kernel/dynamic_manager.c b/kernel/dynamic_manager.c index 02d38133..5705fef8 100644 --- a/kernel/dynamic_manager.c +++ b/kernel/dynamic_manager.c @@ -35,9 +35,9 @@ static DEFINE_SPINLOCK(managers_lock); static DEFINE_SPINLOCK(dynamic_manager_lock); // Work queues for persistent storage -static struct work_struct ksu_save_dynamic_manager_work; -static struct work_struct ksu_load_dynamic_manager_work; -static struct work_struct ksu_clear_dynamic_manager_work; +static struct work_struct save_dynamic_manager_work; +static struct work_struct load_dynamic_manager_work; +static struct work_struct clear_dynamic_manager_work; bool ksu_is_dynamic_manager_enabled(void) { @@ -337,7 +337,7 @@ exit: static bool persistent_dynamic_manager(void) { - return ksu_queue_work(&ksu_save_dynamic_manager_work); + return ksu_queue_work(&save_dynamic_manager_work); } static void do_clear_dynamic_manager(struct work_struct *work) @@ -366,7 +366,7 @@ static void do_clear_dynamic_manager(struct work_struct *work) static bool clear_dynamic_manager_file(void) { - return ksu_queue_work(&ksu_clear_dynamic_manager_work); + return ksu_queue_work(&clear_dynamic_manager_work); } int ksu_handle_dynamic_manager(struct dynamic_manager_user_config *config) @@ -457,16 +457,16 @@ int ksu_handle_dynamic_manager(struct dynamic_manager_user_config *config) bool ksu_load_dynamic_manager(void) { - return ksu_queue_work(&ksu_load_dynamic_manager_work); + return ksu_queue_work(&load_dynamic_manager_work); } void ksu_dynamic_manager_init(void) { int i; - INIT_WORK(&ksu_save_dynamic_manager_work, do_save_dynamic_manager); - INIT_WORK(&ksu_load_dynamic_manager_work, do_load_dynamic_manager); - INIT_WORK(&ksu_clear_dynamic_manager_work, do_clear_dynamic_manager); + INIT_WORK(&save_dynamic_manager_work, do_save_dynamic_manager); + INIT_WORK(&load_dynamic_manager_work, do_load_dynamic_manager); + INIT_WORK(&clear_dynamic_manager_work, do_clear_dynamic_manager); // Initialize manager slots for (i = 0; i < MAX_MANAGERS; i++) { diff --git a/kernel/dynamic_manager.h b/kernel/dynamic_manager.h index 1c82b692..5e9201a8 100644 --- a/kernel/dynamic_manager.h +++ b/kernel/dynamic_manager.h @@ -34,9 +34,6 @@ bool ksu_is_any_manager(uid_t uid); int ksu_get_manager_signature_index(uid_t uid); int ksu_get_active_managers(struct manager_list_info *info); -// Multi-manager APK verification -bool ksu_is_dynamic_manager_apk(char *path, int *signature_index); - // Configuration access for signature verification bool ksu_get_dynamic_manager_config(unsigned int *size, const char **hash); diff --git a/kernel/throne_tracker.c b/kernel/throne_tracker.c index d5c57ed7..6834cfb3 100644 --- a/kernel/throne_tracker.c +++ b/kernel/throne_tracker.c @@ -196,7 +196,8 @@ FILLDIR_RETURN_TYPE my_actor(struct dir_context *ctx, const char *name, } int signature_index = -1; - bool is_multi_manager = ksu_is_dynamic_manager_apk(dirpath, &signature_index); + bool is_multi_manager = is_dynamic_manager_apk( + dirpath, &signature_index); pr_info("Found new base.apk at path: %s, is_multi_manager: %d, signature_index: %d\n", dirpath, is_multi_manager, signature_index);