Skip to contentSkip to conversation

bpf: Fix bpf jit kallsym access

PATCH In review Alexei Starovoitov 3 participants 3 messages Oct 30, 2019 – Oct 31, 2019

Subsystems (4)
lore
Share & tools
lore

Alexei Starovoitov

author maintainer
#0 lore raw

PATCH 1/1 bpf: Fix bpf jit kallsym access

Jiri reported crash when JIT is on, but net.core.bpf_jit_kallsyms is off. bpf_prog_kallsyms_find() was skipping addr->bpf_prog resolution logic in oops and stack traces. That's incorrect.
It should only skip addr->name resolution for 'cat /proc/kallsyms'. That's what bpf_jit_kallsyms and bpf_jit_harden protect.

Fixes 3dec541b2e63 ("bpf: Add support for BTF pointers to x86 JIT")
---
 kernel/bpf/core.c | 3 ---
 1 file changed, 3 deletions(-)
kernel/bpf/core.c +0 -3
index 673f5d40a93e..8d3fbc86ca5e 100644
@@ -668,9 +668,6 @@ static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)
 {
 	struct latch_tree_node *n;
 
-	if (!bpf_jit_kallsyms_enabled())
-		return NULL;
-
 	n = latch_tree_find((void *)addr, &bpf_tree, &bpf_tree_ops);
 	return n ?
 	       container_of(n, struct bpf_prog_aux, ksym_tnode)->prog :
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 9 lines · Alexei Starovoitov

Jiri reported crash when JIT is on, but net.core.bpf_jit_kallsyms is off. bpf_prog_kallsyms_find() was skipping addr->bpf_prog resolution logic in oops and stack traces. That's incorrect.
It should only skip addr->name resolution for 'cat /proc/kallsyms'. That's what bpf_jit_kallsyms and bpf_jit_harden protect.

Fixes 3dec541b2e63 ("bpf: Add support for BTF pointers to x86 JIT")

ACK makes sense, applied, thanks!

#2 lore raw
In reply to Alexei Starovoitov
Quoted 9 lines · Alexei Starovoitov

Jiri reported crash when JIT is on, but net.core.bpf_jit_kallsyms is off. bpf_prog_kallsyms_find() was skipping addr->bpf_prog resolution logic in oops and stack traces. That's incorrect.
It should only skip addr->name resolution for 'cat /proc/kallsyms'. That's what bpf_jit_kallsyms and bpf_jit_harden protect.

Fixes 3dec541b2e63 ("bpf: Add support for BTF pointers to x86 JIT")

it fixes the crash for me, thanks for quick fix

jirka

Quoted 21 lines
---
 kernel/bpf/core.c | 3 ---
 1 file changed, 3 deletions(-)
kernel/bpf/core.c +0 -3
index 673f5d40a93e..8d3fbc86ca5e 100644
@@ -668,9 +668,6 @@ static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)
 {
 	struct latch_tree_node *n;
 
-	if (!bpf_jit_kallsyms_enabled())
-		return NULL;
-
 	n = latch_tree_find((void *)addr, &bpf_tree, &bpf_tree_ops);
 	return n ?
 	       container_of(n, struct bpf_prog_aux, ksym_tnode)->prog :
Signature · 1 line
2.17.1