summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAndrii Nakryiko <andrii@kernel.org>2026-08-05 11:38:36 -0700
committerAndrii Nakryiko <andrii@kernel.org>2026-08-05 11:40:28 -0700
commit9f04670efab1311ea57d8422a5db5f43e4765ee9 (patch)
tree51321a7bea20596918e85a5592f321a32fd03a26 /kernel
parent8295c273eaf502496c92b92bc60522d6202230c2 (diff)
parent045809795751897ebbb82ab775edd8a3d040d66f (diff)
Merge branch 'bpf-fix-sleepable-check-for-tracing-lsm-prog'
Leon Hwang says: ==================== bpf: Fix sleepable check for tracing/lsm prog When CONFIG_FUNCTION_ERROR_INJECTION is disabled, a sleepable tracing prog is allowed to attach to '__x64_'-alike prefix symbols. It is because the verifier does not verify whether the symbol is a kernel function or a bpf prog. That said, a sleepable tracing prog is allowed to attach to a bpf prog target whose name has '__x64_'-alike prefix. For example, a sleepable fentry prog attaches to a '__x64_sys_nop' XDP prog, and copies buffer from a user pointer with bpf_copy_from_user() helper. After attaching the XDP prog to lo interface, the kernel BUG could be triggered by 'ping -c 1 -W 1 127.0.0.1': [ 3.460756] BUG: sleeping function called from invalid context at kernel/bpf/trampoline.c:1324 Fix it by disallowing sleepable prog always when its target btf is not kernel's btf. Changes: v3 -> v4: * Move btf check outside of 'switch (prog->type)'. (per Andrii) * v3: https://lore.kernel.org/bpf/20260804145710.43062-1-leon.hwang@linux.dev/ v2 -> v3: * Use btf_is_kernel() instead of passing 'tgt_prog'. (per Andrii) * v2: https://lore.kernel.org/bpf/20260725132624.78373-1-leon.hwang@linux.dev/ v1 -> v2: * Drop redundant 'prog->sleepable' check. (per Viktor) * Collect Acked-by from Viktor, Thanks. * v1: https://lore.kernel.org/bpf/20260724141422.10463-1-leon.hwang@linux.dev/ ==================== Link: https://patch.msgid.link/20260805150810.34907-1-leon.hwang@linux.dev Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/bpf/verifier.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 4db151e24355..d925197c2e5f 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -19022,6 +19022,9 @@ static int btf_id_allow_sleepable(u32 btf_id, unsigned long addr, const struct b
const struct btf_type *t;
const char *tname;
+ if (!btf_is_kernel(btf))
+ return -EINVAL;
+
switch (prog->type) {
case BPF_PROG_TYPE_TRACING:
t = btf_type_by_id(btf, btf_id);