Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 13 additions & 44 deletions kernel/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,7 @@ 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)
{
Expand All @@ -210,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);
Expand All @@ -243,48 +223,37 @@ bootstrap_scan:;
return -ENOENT;

smp_mb();

int r = resolve_init_user_ns();
if (r)
return r;

return 0;
}

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;
Expand Down
27 changes: 22 additions & 5 deletions kernel/routine.h
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand All @@ -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);
}
}

Expand Down
Loading