Skip to content

Commit e874208

Browse files
Martin KaFai LauAlexei Starovoitov
Martin KaFai Lau
authored and
Alexei Starovoitov
committedMar 29, 2024
bpf: Mark bpf prog stack with kmsan_unposion_memory in interpreter mode
syzbot reported uninit memory usages during map_{lookup,delete}_elem. ========== BUG: KMSAN: uninit-value in __dev_map_lookup_elem kernel/bpf/devmap.c:441 [inline] BUG: KMSAN: uninit-value in dev_map_lookup_elem+0xf3/0x170 kernel/bpf/devmap.c:796 __dev_map_lookup_elem kernel/bpf/devmap.c:441 [inline] dev_map_lookup_elem+0xf3/0x170 kernel/bpf/devmap.c:796 ____bpf_map_lookup_elem kernel/bpf/helpers.c:42 [inline] bpf_map_lookup_elem+0x5c/0x80 kernel/bpf/helpers.c:38 ___bpf_prog_run+0x13fe/0xe0f0 kernel/bpf/core.c:1997 __bpf_prog_run256+0xb5/0xe0 kernel/bpf/core.c:2237 ========== The reproducer should be in the interpreter mode. The C reproducer is trying to run the following bpf prog: 0: (18) r0 = 0x0 2: (18) r1 = map[id:49] 4: (b7) r8 = 16777216 5: (7b) *(u64 *)(r10 -8) = r8 6: (bf) r2 = r10 7: (07) r2 += -229 ^^^^^^^^^^ 8: (b7) r3 = 8 9: (b7) r4 = 0 10: (85) call dev_map_lookup_elem#1543472 11: (95) exit It is due to the "void *key" (r2) passed to the helper. bpf allows uninit stack memory access for bpf prog with the right privileges. This patch uses kmsan_unpoison_memory() to mark the stack as initialized. This should address different syzbot reports on the uninit "void *key" argument during map_{lookup,delete}_elem. Reported-by: [email protected] Closes: https://lore.kernel.org/bpf/[email protected]/ Reported-by: [email protected] Closes: https://lore.kernel.org/bpf/[email protected]/ Reported-by: [email protected] Closes: https://lore.kernel.org/bpf/[email protected]/ Reported-by: [email protected] Closes: https://lore.kernel.org/bpf/[email protected]/ Reported-by: [email protected] Closes: https://lore.kernel.org/bpf/[email protected]/ Tested-by: [email protected] Suggested-by: Yonghong Song <[email protected]> Suggested-by: Alexei Starovoitov <[email protected]> Signed-off-by: Martin KaFai Lau <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent e478cf2 commit e874208

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed
 

‎kernel/bpf/core.c

+2
Original file line numberDiff line numberDiff line change
@@ -2218,6 +2218,7 @@ static unsigned int PROG_NAME(stack_size)(const void *ctx, const struct bpf_insn
22182218
u64 stack[stack_size / sizeof(u64)]; \
22192219
u64 regs[MAX_BPF_EXT_REG] = {}; \
22202220
\
2221+
kmsan_unpoison_memory(stack, sizeof(stack)); \
22212222
FP = (u64) (unsigned long) &stack[ARRAY_SIZE(stack)]; \
22222223
ARG1 = (u64) (unsigned long) ctx; \
22232224
return ___bpf_prog_run(regs, insn); \
@@ -2231,6 +2232,7 @@ static u64 PROG_NAME_ARGS(stack_size)(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5, \
22312232
u64 stack[stack_size / sizeof(u64)]; \
22322233
u64 regs[MAX_BPF_EXT_REG]; \
22332234
\
2235+
kmsan_unpoison_memory(stack, sizeof(stack)); \
22342236
FP = (u64) (unsigned long) &stack[ARRAY_SIZE(stack)]; \
22352237
BPF_R1 = r1; \
22362238
BPF_R2 = r2; \

0 commit comments

Comments
 (0)
Please sign in to comment.