Revert "ci: bump ddk to 20251104, fix android16-6.12 lkm"

This reverts commit 257f0ca6de.

kernel/allowlist.c

@@ -15,6 +15,7 @@
 #include "ksu.h"
 #include "klog.h" // IWYU pragma: keep
 #include "selinux/selinux.h"
+#include "kernel_compat.h"
 #include "allowlist.h"
 #include "manager.h"
 
@@ -526,7 +527,7 @@ void ksu_allowlist_exit(void)
     mutex_unlock(&allowlist_mutex);
 }
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
 bool ksu_temp_grant_root_once(uid_t uid)
 {
     struct app_profile profile = {

kernel/allowlist.h

@@ -3,7 +3,6 @@
 
 #include <linux/types.h>
 #include "ksu.h"
-#include "kernel_compat.h"
 
 void ksu_allowlist_init(void);
 
@@ -26,7 +25,7 @@ bool ksu_set_app_profile(struct app_profile *, bool persist);
 bool ksu_uid_should_umount(uid_t uid);
 struct root_profile *ksu_get_root_profile(uid_t uid);
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
 bool ksu_temp_grant_root_once(uid_t uid);
 void ksu_temp_revoke_root_once(uid_t uid);
 #endif

kernel/core_hook.c

@@ -37,10 +37,11 @@
 #include "ksud.h"
 #include "manager.h"
 #include "selinux/selinux.h"
+#include "kernel_compat.h"
 #include "supercalls.h"
 #include "sulog.h"
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
 #include "manual_su.h"
 #endif
 
@@ -56,7 +57,7 @@ bool ksu_is_compat __read_mostly = false;
 
 extern int __ksu_handle_devpts(struct inode *inode); // sucompat.c
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
 static void ksu_try_escalate_for_uid(uid_t uid)
 {
     if (!is_pending_root(uid))
@@ -240,7 +241,7 @@ void escape_to_root(void)
 #endif
 }
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
 
 static void disable_seccomp_for_task(struct task_struct *tsk)
 {
@@ -401,7 +402,7 @@ static void sulog_prctl_cmd(uid_t uid, unsigned long cmd)
 
     switch (cmd) {
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
     case CMD_MANUAL_SU_REQUEST:             name = "prctl_manual_su_request"; break;
 #endif
 
@@ -437,7 +438,7 @@ int ksu_handle_prctl(int option, unsigned long arg2, unsigned long arg3,
     pr_info("option: 0x%x, cmd: %ld\n", option, arg2);
 #endif
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
     if (arg2 == CMD_MANUAL_SU_REQUEST) {
         struct manual_su_request request;
         int su_option = (int)arg3;
@@ -778,7 +779,7 @@ static int ksu_bprm_check_handler_pre(struct kprobe *p, struct pt_regs *regs)
 
     ksu_handle_pre_ksud(filename);
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
     ksu_try_escalate_for_uid(current_uid().val);
 #endif
 
@@ -790,7 +791,7 @@ static struct kprobe ksu_bprm_check_kp = {
     .pre_handler = ksu_bprm_check_handler_pre,
 };
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
 // 6. task_alloc hook for handling manual su escalation
 static int ksu_task_alloc_handler_pre(struct kprobe *p, struct pt_regs *regs)
 {
@@ -851,7 +852,7 @@ __maybe_unused int ksu_kprobe_init(void)
         pr_info("bprm_check_security kprobe registered successfully\n");
     }
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
     // Register task_alloc kprobe
     rc = register_kprobe(&ksu_task_alloc_kp);
     if (rc) {
@@ -871,7 +872,7 @@ __maybe_unused int ksu_kprobe_exit(void)
     unregister_kprobe(&prctl_kp);
     unregister_kprobe(&ksu_inode_permission_kp);
     unregister_kprobe(&ksu_bprm_check_kp);
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
     unregister_kprobe(&ksu_task_alloc_kp);
 #endif
     return 0;

kernel/kernel_compat.h

@@ -14,15 +14,6 @@
 #define __KPROBES_HOOK 1
 #endif
 
-#if defined(CONFIG_KPROBES) && !(defined(CONFIG_KSU_MANUAL_SU))
-#define __MANUAL_SU 1
-#elif defined(CONFIG_KPROBES) && defined(CONFIG_KSU_MANUAL_SU)
-#define __MANUAL_SU 1
-#elif !defined(CONFIG_KSU_MANUAL_SU)
-#define __MANUAL_SU 0
-#else
-#define __MANUAL_SU 1
-#endif
 
 #if defined(CONFIG_ARM) || defined(CONFIG_ARM64)
 // arch/arm64/include/asm/barrier.h, adding dsb probably unneeded

kernel/ksu.h

@@ -3,14 +3,13 @@
 
 #include <linux/types.h>
 #include <linux/workqueue.h>
-#include "kernel_compat.h"
 
 #define KERNEL_SU_VERSION KSU_VERSION
 #define KERNEL_SU_OPTION 0xDEADBEEF
 
 extern bool ksu_uid_scanner_enabled;
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
 #define CMD_MANUAL_SU_REQUEST 50
 #endif
 

kernel/supercalls.c

@@ -21,7 +21,7 @@
 #include "throne_comm.h"
 #include "dynamic_manager.h"
 
-#ifdef __MANUAL_SU
+#ifdef CONFIG_KSU_MANUAL_SU
 #include "manual_su.h"
 #endif