bpf: fix array-index-out-of-bounds in print_bpf_insn
PATCH 1/1 bpf: fix array-index-out-of-bounds in print_bpf_insn
syzkaller triggers UBSAN array-index-out-of-bounds and panic_on_warn panic in print_bpf_insn() when loading a BPF program containing BPF_LDX | BPF_MEMSX | BPF_DW.
bpf_ldsx_string[] holds three entries for B/H/W (s8/s16/s32). BPF_DW gives index 3 and reads past the array. check_subprogs() prints the program via bpf_diag_program_structure() before do_check() validates the instruction, so the illegal insn reaches the disassembler.
UBSAN: array-index-out-of-bounds in kernel/bpf/disasm.c:306:21
index 3 is out of range for type 'char *[3]'
print_bpf_insn+0x2328/0x2940 kernel/bpf/disasm.c:306
format_disasm_line kernel/bpf/diagnostics.c:633
diag_print_insn_context+0x3a5/0x930 kernel/bpf/diagnostics.c:783
bpf_diag_source+0x615/0x14a0 kernel/bpf/diagnostics.c:896
bpf_diag_program_structure+0x1f9/0x280 kernel/bpf/diagnostics.c:1215
check_subprogs+0x5c3/0x650 kernel/bpf/verifier.c:3057
bpf_check+0x1935/0x89f0 kernel/bpf/verifier.c:21097
bpf_prog_load+0x17dd/0x2990 kernel/bpf/syscall.c:3133Guard any size index beyond the corresponding string table and emit BUG_ldx instead of accessing memory beyond the end of the the array.
--- kernel/bpf/disasm.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
kernel/bpf/disasm.c +14 -2
@@ -295,15 +295,27 @@ void print_bpf_insn(const struct bpf_insn_cbs *cbs,verbose (cbs->private_data,"BUG_st_%02x" , insn->code); } }else if (class ==BPF_LDX ) { +unsigned int array_size =ARRAY_SIZE (bpf_ldsx_string); +unsigned int size_idx =BPF_SIZE (insn->code) >>3 ; +if (BPF_MODE (insn->code) !=BPF_MEM &&BPF_MODE (insn->code) !=BPF_MEMSX ) {verbose (cbs->private_data,"BUG_ldx_%02x" , insn->code);return ; } + +if (BPF_MODE (insn->code) ==BPF_MEM ) + array_size =ARRAY_SIZE (bpf_ldst_string); + +if (size_idx >= array_size) { +verbose (cbs->private_data,"BUG_ldx_%02x" , insn->code); +return ; + } +verbose (cbs->private_data,"(%02x) r%d = *(%s *)(r%d %+d)" , insn->code, insn->dst_reg,BPF_MODE (insn->code) ==BPF_MEM ? - bpf_ldst_string[BPF_SIZE (insn->code) >>3 ] : - bpf_ldsx_string[BPF_SIZE (insn->code) >>3 ], + bpf_ldst_string[size_idx] : + bpf_ldsx_string[size_idx], insn->src_reg, insn->off); }else if (class ==BPF_LD ) {if (BPF_MODE (insn->code) ==BPF_ABS ) {
Signature · 1 line
2.53.0-Meta
Kumar Kartikeya Dwivedi
maintainerQuoted 21 lines · Rik van Riel
syzkaller triggers UBSAN array-index-out-of-bounds and
panic_on_warnpanic inprint_bpf_insn()when loading a BPF program containingBPF_LDX|BPF_MEMSX|BPF_DW.bpf_ldsx_string[] holds three entries for B/H/W (s8/s16/s32).
BPF_DWgives index 3 and reads past the array.check_subprogs()prints the program viabpf_diag_program_structure()beforedo_check()validates the instruction, so the illegal insn reaches the disassembler.UBSAN: array-index-out-of-bounds in kernel/bpf/disasm.c:306:21 index 3 is out of range for type 'char *[3]' print_bpf_insn+0x2328/0x2940 kernel/bpf/disasm.c:306 format_disasm_line kernel/bpf/diagnostics.c:633 diag_print_insn_context+0x3a5/0x930 kernel/bpf/diagnostics.c:783 bpf_diag_source+0x615/0x14a0 kernel/bpf/diagnostics.c:896 bpf_diag_program_structure+0x1f9/0x280 kernel/bpf/diagnostics.c:1215 check_subprogs+0x5c3/0x650 kernel/bpf/verifier.c:3057 bpf_check+0x1935/0x89f0 kernel/bpf/verifier.c:21097 bpf_prog_load+0x17dd/0x2990 kernel/bpf/syscall.c:3133
Quoted 7 lines
Guard any size index beyond the corresponding string table and emit
BUG_ldxinstead of accessing memory beyond the end of the the array.Fixes f835bb622299 ("bpf: Add kernel/bpftool asm support for new instructions")Assisted-by claw:muse-spark-1.2 syzkallerSigned-off-by Rik van Riel <[email protected]>---
Already fixed by https://lore.kernel.org/bpf/[email protected].
pw-bot: cr
Quoted 1 line
[...]
[email protected]
AI reviewThe panic_on_warn claim appears unsupported by the underlying report. While __ubsan_handle_out_of_bounds can trigger a panic when panic_on_warn is set, the referenced report shows no panic - it ends…
Quoted 3 lines
syzkaller triggers UBSAN array-index-out-of-bounds and
panic_on_warnpanic inprint_bpf_insn()when loading a BPF program containingBPF_LDX|BPF_MEMSX|BPF_DW.
The panic_on_warn claim appears unsupported by the underlying report. While __ubsan_handle_out_of_bounds can trigger a panic when panic_on_warn is set, the referenced report shows no panic - it ends with '---[ end trace ]---' and the kernel continued. Can this line be adjusted to describe what actually occurred?
Quoted 5 lines
bpf_ldsx_string[] holds three entries for B/H/W (s8/s16/s32).
BPF_DWgives index 3 and reads past the array.check_subprogs()prints the program viabpf_diag_program_structure()beforedo_check()validates the instruction, so the illegal insn reaches the disassembler.
The validation order may not be quite right here. Looking at bpf_check(), the sequence is:
bpf_check()
check_subprogs() (verifier.c:21236)
check_and_resolve_insns() (verifier.c:21246)
bpf_opcode_in_insntable() (verifier.c:19282)
do_check_subprogs() (verifier.c:21307)The opcode 0x99 (BPF_LDX|BPF_MEMSX|BPF_DW) is rejected by bpf_opcode_in_insntable() inside check_and_resolve_insns(), which runs after check_subprogs() but before do_check_subprogs(). This instruction never reaches do_check() at all - do_check() is not what validates it. Should the explanation reference check_and_resolve_insns() instead?
Quoted 10 lines
UBSAN: array-index-out-of-bounds in kernel/bpf/disasm.c:306:21
index 3 is out of range for type 'char *[3]'
print_bpf_insn+0x2328/0x2940 kernel/bpf/disasm.c:306
format_disasm_line kernel/bpf/diagnostics.c:633
diag_print_insn_context+0x3a5/0x930 kernel/bpf/diagnostics.c:783
bpf_diag_source+0x615/0x14a0 kernel/bpf/diagnostics.c:896
bpf_diag_program_structure+0x1f9/0x280 kernel/bpf/diagnostics.c:1215
check_subprogs+0x5c3/0x650 kernel/bpf/verifier.c:3057
bpf_check+0x1935/0x89f0 kernel/bpf/verifier.c:21097
bpf_prog_load+0x17dd/0x2990 kernel/bpf/syscall.c:3133This trace doesn't match the original report. The column is 6 not 21, the type is 'const char *const[3]' not 'char *[3]', and every symbol offset differs:
print_bpf_insn+0x21f1/0x2910 (not +0x2328/0x2940) diag_print_insn_context+0x433/0xd00 (not +0x3a5/0x930) bpf_diag_source+0x66a/0x1950 (not +0x615/0x14a0) bpf_diag_program_structure+0x31c/0x430 (not +0x1f9/0x280) check_subprogs+0x66b/0x740 (not +0x5c3/0x650) bpf_check+0x17ba/0x2e10 (not +0x1935/0x89f0) bpf_prog_load+0x14d6/0x1c20 (not +0x17dd/0x2990)
Some of the line numbers are also impossible: verifier.c:3057 falls outside check_subprogs() which spans 3060-3125 (its bpf_diag_program_structure calls are at 3093 and 3111), and verifier.c:21097 falls outside bpf_check() which starts at 21115 (its check_subprogs call is at 21236). Was this trace from a different build or kernel version? It would help to include the exact trace from the original report.
Quoted 4 lines
Guard any size index beyond the corresponding string table and emit
BUG_ldxinstead of accessing memory beyond the end of the the array.Fixes f835bb622299 ("bpf: Add kernel/bpftool asm support for newinstructions")
The f835bb622299 commit is where the unguarded code was introduced, but is it the right Fixes target for a crash tag? That code was unreachable for three years because print_bpf_insn was only called on instructions that had already passed bpf_opcode_in_insntable(). The OOB became reachable when check_subprogs() started emitting Program Structure diagnostics before opcode validation. Should the Fixes tag point at the commit that made check_subprogs() print diagnostics instead?
Quoted 2 lines
Assisted-by claw:muse-spark-1.2 syzkallerSigned-off-by Rik van Riel <[email protected]>
The commit states 'syzkaller triggers ...' but includes no Reported-by, Closes, or Link tag. The original report explicitly requests 'IMPORTANT:
if you fix the issue, please add the following tag to the commit:
Should these tags be added so the report can be auto-closed and reviewers can cross-check the trace?
Also, the Signed-off-by email shows '[email protected]' (capital M) while the Author line shows '[email protected]' (lowercase m).
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
CI run summary: https://github.com/kernel-patches/bpf/actions/runs/32776324846