From 66274748b425c15520d612a1fc36853dadcf5187 Mon Sep 17 00:00:00 2001 From: backslashxx <118538522+backslashxx@users.noreply.github.com> Date: Mon, 9 Nov 2026 14:32:54 +0800 Subject: [PATCH 1/2] kernel: resolve init_user_ns via ksym --- kernel/main.c | 6 ++++++ kernel/routine.h | 27 ++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/kernel/main.c b/kernel/main.c index 3f63632..c56f9be 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -184,6 +184,7 @@ found_candidate:; static uintptr_t register_kprobe_fn; static uintptr_t unregister_kprobe_fn; static uintptr_t kp_kallsyms_lookup_name(const char *name); +static int resolve_init_user_ns(void); static int bootstrap_module(void) { @@ -243,6 +244,11 @@ bootstrap_scan:; return -ENOENT; smp_mb(); + + int r = resolve_init_user_ns(); + if (r) + return r; + return 0; } diff --git a/kernel/routine.h b/kernel/routine.h index 5f803f8..896a881 100644 --- a/kernel/routine.h +++ b/kernel/routine.h @@ -24,6 +24,24 @@ static const int AID_USER_OFFSET = 100000; #define is_seccomp_enabled() (!!current->seccomp.mode) #endif +#ifdef MODULE +static uintptr_t init_ns_ksym_p __read_mostly = 0x0; +static __always_inline struct user_namespace *init_ns_p(void) +{ + return (struct user_namespace *)init_ns_ksym_p; +} +static int resolve_init_user_ns(void) +{ + init_ns_ksym_p = (uintptr_t)kallsyms_lookup_name("init_user_ns"); + if (!init_ns_ksym_p) + return -ENOENT; + return 0; +} +#else +#define init_ns_p() ({ &init_user_ns; }) +static int resolve_init_user_ns(void) { return 0; } +#endif + static __always_inline bool getpriority_should_swap(int who) { if (unlikely(!is_seccomp_enabled())) @@ -41,22 +59,21 @@ static __always_inline bool getpriority_should_swap(int who) if (unlikely(cuid >= MIN_ISOLATED_PROCESS_UID)) { struct user_namespace *ns = current_cred()->user_ns; - if (ns && ns != &init_user_ns) + if (ns && ns != init_ns_p()) { kuid_t host_kuid = make_kuid(ns, 0); - if (uid_valid(host_kuid)) - cuid = from_kuid(&init_user_ns, host_kuid); + cuid = from_kuid(init_ns_p(), host_kuid); } } if (unlikely(who >= MIN_ISOLATED_PROCESS_UID)) { struct user_namespace *ns = current_cred()->user_ns; - if (ns && ns != &init_user_ns) + if (ns && ns != init_ns_p()) { kuid_t host_kuid = make_kuid(ns, 0); if (uid_valid(host_kuid)) - who = from_kuid(&init_user_ns, host_kuid); + who = from_kuid(init_ns_p(), host_kuid); } } From 1cdb2fc311aa218b108e6fe4e0e8c2504e67b01a Mon Sep 17 00:00:00 2001 From: backslashxx <118538522+backslashxx@users.noreply.github.com> Date: Mon, 9 Nov 2026 15:31:48 +0800 Subject: [PATCH 2/2] Revert "kernel: tweak kprobe reg symbol resolve (#12)" This reverts commit ade6b544a6a1f2fde53918c44b4f894fe64710db. --- kernel/main.c | 51 +++++++-------------------------------------------- 1 file changed, 7 insertions(+), 44 deletions(-) diff --git a/kernel/main.c b/kernel/main.c index c56f9be..b470f67 100644 --- a/kernel/main.c +++ b/kernel/main.c @@ -180,10 +180,6 @@ found_candidate:; return 0; } -// fwd -static uintptr_t register_kprobe_fn; -static uintptr_t unregister_kprobe_fn; -static uintptr_t kp_kallsyms_lookup_name(const char *name); static int resolve_init_user_ns(void); static int bootstrap_module(void) @@ -211,23 +207,6 @@ static int bootstrap_module(void) goto resolve; bootstrap:; - register_kprobe_fn = symbol_get(register_kprobe); - unregister_kprobe_fn = symbol_get(unregister_kprobe); - if (!register_kprobe_fn || !unregister_kprobe_fn) { - pr_info("kprobe symbols missing or not exported! \n"); - goto bootstrap_scan; - } - - // no-op for kernel symbols, keep as a reminder - // symbol_put(register_kprobe); - // symbol_put(unregister_kprobe); - - // now we can try to get kallsyms_lookup_name via kp - kallsyms_lookup_name_fn = kp_kallsyms_lookup_name("kallsyms_lookup_name"); - if (kallsyms_lookup_name_fn) - goto resolve; - -bootstrap_scan:; constexpr char sym[] = "sprint_symbol"; uintptr_t addr = (uintptr_t)&sprint_symbol; pr_info("%s: %s @ 0x%lx \n", __func__, sym, addr); @@ -256,41 +235,25 @@ static struct kobject *mod_kobj_parent_backup = nullptr; #endif // MODULE -static uintptr_t register_kprobe_fn = 0x0; +// override kprobe reg and unreg static __nocfi int __register_kprobe(struct kprobe *p) { - if (!register_kprobe_fn) - register_kprobe_fn = (uintptr_t)kallsyms_lookup_name("register_kprobe"); - if (!register_kprobe_fn) + typeof(__register_kprobe) *fn = kallsyms_lookup_name("register_kprobe"); + if (!fn) return -ENOENT; - return ((typeof(__register_kprobe) *)register_kprobe_fn)(p); + return fn(p); } #define register_kprobe __register_kprobe -static uintptr_t unregister_kprobe_fn = 0x0; static __nocfi void __unregister_kprobe(struct kprobe *p) { - if (!unregister_kprobe_fn) - unregister_kprobe_fn = (uintptr_t)kallsyms_lookup_name("unregister_kprobe"); - if (!unregister_kprobe_fn) + typeof(__unregister_kprobe) *fn = kallsyms_lookup_name("unregister_kprobe"); + if (!fn) return; - ((typeof(__unregister_kprobe) *)unregister_kprobe_fn)(p); + fn(p); } #define unregister_kprobe __unregister_kprobe -static uintptr_t kp_kallsyms_lookup_name(const char *name) -{ - struct kprobe kp = { .symbol_name = name }; - if (!!register_kprobe(&kp)) - return 0x0; - - uintptr_t addr = (uintptr_t)kp.addr; - unregister_kprobe(&kp); - - pr_info("%s: success! %s at 0x%lx\n", __func__, name, addr); - return addr; -} - static size_t get_ksym_size(uintptr_t symbol_addr, size_t retfail) { unsigned long offset = 0;