bpf: fix out of bounds access in verifier log
Subsystems (4)
PATCH 1/1 bpf: fix out of bounds access in verifier log
when the verifier log is enabled the print_bpf_insn() is doing bpf_alu_string[BPF_OP(insn->code) >> 4]
and
bpf_jmp_string[BPF_OP(insn->code) >> 4]
where BPF_OP is a 4-bit instruction opcode. Malformed insns can cause out of bounds access.
Fix it by sizing arrays appropriately.
The bug was found by clang address sanitizer with libfuzzer.
---
fyi sanitizer error looks like:
...
27 invalid dst register in STX OK
28 invalid dst register in ST OK
29 invalid src register in LDX OK
30 invalid dst register in LDX OK
31 junk insn OK
32 junk insn2 OK
=================================================================
==52730==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000000500c58 READ of size 8 at 0x000000500c58 thread T0
#0 0x4e480b in print_bpf_insn verifier.c:332:5
#1 0x4e1bcb in do_check verifier.c:1657:4
...
0x000000500c58 is located 8 bytes to the right of global variable 'bpf_alu_string'
defined in 'verifier.c:286:26' (0x500be0) of size 112
---
kernel/bpf/verifier.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)kernel/bpf/verifier.c +2 -2
@@ -283,7 +283,7 @@ static const char *const bpf_class_string[] = { [BPF_ALU64] = "alu64", }; -static const char *const bpf_alu_string[] = { +static const char *const bpf_alu_string[16 ] = { [BPF_ADD >>4 ] ="+=" , [BPF_SUB >>4 ] ="-=" , [BPF_MUL >>4 ] ="*=" ,
@@ -307,7 +307,7 @@ static const char *const bpf_ldst_string[] = { [BPF_DW >> 3] = "u64", }; -static const char *const bpf_jmp_string[] = { +static const char *const bpf_jmp_string[16 ] = { [BPF_JA >>4 ] ="jmp" , [BPF_JEQ >>4 ] ="==" , [BPF_JGT >>4 ] =">" ,
Signature · 1 line
1.7.9.5
Quoted 8 lines · Alexei Starovoitov
when the verifier log is enabled the
print_bpf_insn()is doing bpf_alu_string[BPF_OP(insn->code) >> 4]
and
bpf_jmp_string[BPF_OP(insn->code) >> 4]
whereBPF_OPis a 4-bit instruction opcode. Malformed insns can cause out of bounds access.
Fix it by sizing arrays appropriately.
Quoted 4 lines
The bug was found by clang address sanitizer with libfuzzer.
Reported-by Yonghong Song <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>
From: Alexei Starovoitov <[email protected]>
Date: Tue, 8 Sep 2015 13:40:01 -0700
Quoted 8 lines
when the verifier log is enabled the
print_bpf_insn()is doing bpf_alu_string[BPF_OP(insn->code) >> 4]
and
bpf_jmp_string[BPF_OP(insn->code) >> 4]
whereBPF_OPis a 4-bit instruction opcode. Malformed insns can cause out of bounds access.
Fix it by sizing arrays appropriately.
Quoted 4 lines
The bug was found by clang address sanitizer with libfuzzer.
Reported-by Yonghong Song <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>
Applied, thanks.