Skip to content

Commit 8a8f704

Browse files
laoarKernel Patches Daemon
authored and
Kernel Patches Daemon
committed
bpf: Reject attaching fexit/fmod_ret to __noreturn functions
If we attach fexit/fmod_ret to __noreturn functions, it will cause an issue that the bpf trampoline image will be left over even if the bpf link has been destroyed. Take attaching do_exit() with fexit for example. The fexit works as follows, bpf_trampoline + __bpf_tramp_enter + percpu_ref_get(&tr->pcref); + call do_exit() + __bpf_tramp_exit + percpu_ref_put(&tr->pcref); Since do_exit() never returns, the refcnt of the trampoline image is never decremented, preventing it from being freed. That can be verified with as follows, $ bpftool link show <<<< nothing output $ grep "bpf_trampoline_[0-9]" /proc/kallsyms ffffffffc04cb000 t bpf_trampoline_6442526459 [bpf] <<<< leftover In this patch, all functions annotated with __noreturn are rejected, except for the following cases: - Functions that result in a system reboot, such as panic, machine_real_restart and rust_begin_unwind - Functions that are never executed by tasks, such as rest_init and cpu_startup_entry - Functions implemented in assembly, such as rewind_stack_and_make_dead and xen_cpu_bringup_again, lack an associated BTF ID. With this change, attaching fexit probes to functions like do_exit() will be rejected. $ ./fexit libbpf: prog 'fexit': BPF program load failed: -EINVAL libbpf: prog 'fexit': -- BEGIN PROG LOAD LOG -- Attaching fexit/fmod_ret to __noreturn functions is rejected. Signed-off-by: Yafang Shao <[email protected]>
1 parent 503edd4 commit 8a8f704

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed

kernel/bpf/verifier.c

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23215,6 +23215,33 @@ BTF_ID(func, __rcu_read_unlock)
2321523215
#endif
2321623216
BTF_SET_END(btf_id_deny)
2321723217

23218+
/* fexit and fmod_ret can't be used to attach to __noreturn functions.
23219+
* Currently, we must manually list all __noreturn functions here. Once a more
23220+
* robust solution is implemented, this workaround can be removed.
23221+
*/
23222+
BTF_SET_START(noreturn_deny)
23223+
#ifdef CONFIG_IA32_EMULATION
23224+
BTF_ID(func, __ia32_sys_exit)
23225+
BTF_ID(func, __ia32_sys_exit_group)
23226+
#endif
23227+
#ifdef CONFIG_KUNIT
23228+
BTF_ID(func, __kunit_abort)
23229+
BTF_ID(func, kunit_try_catch_throw)
23230+
#endif
23231+
#ifdef CONFIG_MODULES
23232+
BTF_ID(func, __module_put_and_kthread_exit)
23233+
#endif
23234+
#ifdef CONFIG_X86_64
23235+
BTF_ID(func, __x64_sys_exit)
23236+
BTF_ID(func, __x64_sys_exit_group)
23237+
#endif
23238+
BTF_ID(func, do_exit)
23239+
BTF_ID(func, do_group_exit)
23240+
BTF_ID(func, kthread_complete_and_exit)
23241+
BTF_ID(func, kthread_exit)
23242+
BTF_ID(func, make_task_dead)
23243+
BTF_SET_END(noreturn_deny)
23244+
2321823245
static bool can_be_sleepable(struct bpf_prog *prog)
2321923246
{
2322023247
if (prog->type == BPF_PROG_TYPE_TRACING) {
@@ -23301,6 +23328,11 @@ static int check_attach_btf_id(struct bpf_verifier_env *env)
2330123328
} else if (prog->type == BPF_PROG_TYPE_TRACING &&
2330223329
btf_id_set_contains(&btf_id_deny, btf_id)) {
2330323330
return -EINVAL;
23331+
} else if ((prog->expected_attach_type == BPF_TRACE_FEXIT ||
23332+
prog->expected_attach_type == BPF_MODIFY_RETURN) &&
23333+
btf_id_set_contains(&noreturn_deny, btf_id)) {
23334+
verbose(env, "Attaching fexit/fmod_ret to __noreturn functions is rejected.\n");
23335+
return -EINVAL;
2330423336
}
2330523337

2330623338
key = bpf_trampoline_compute_key(tgt_prog, prog->aux->attach_btf, btf_id);

0 commit comments

Comments
 (0)