Commit 797d73e
bpf: Check the remaining info_cnt before repeating btf fields
When trying to repeat the btf fields for array of nested struct, it
doesn't check the remaining info_cnt. The following splat will be
reported when the value of ret * nelems is greater than BTF_FIELDS_MAX:
------------[ cut here ]------------
UBSAN: array-index-out-of-bounds in ../kernel/bpf/btf.c:3951:49
index 11 is out of range for type 'btf_field_info [11]'
CPU: 6 UID: 0 PID: 411 Comm: test_progs ...... 6.11.0-rc4+ #1
Tainted: [O]=OOT_MODULE
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ...
Call Trace:
<TASK>
dump_stack_lvl+0x57/0x70
dump_stack+0x10/0x20
ubsan_epilogue+0x9/0x40
__ubsan_handle_out_of_bounds+0x6f/0x80
? kallsyms_lookup_name+0x48/0xb0
btf_parse_fields+0x992/0xce0
map_create+0x591/0x770
__sys_bpf+0x229/0x2410
__x64_sys_bpf+0x1f/0x30
x64_sys_call+0x199/0x9f0
do_syscall_64+0x3b/0xc0
entry_SYSCALL_64_after_hwframe+0x4b/0x53
RIP: 0033:0x7fea56f2cc5d
......
</TASK>
---[ end trace ]---
Fix it by checking the remaining info_cnt in btf_repeat_fields() before
repeating the btf fields.
Fixes: 64e8ee8 ("bpf: look into the types of the fields of a struct type recursively.")
Signed-off-by: Hou Tao <houtao1@huawei.com>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20241008071114.3718177-2-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>1 parent b24d7f0 commit 797d73e
1 file changed
Lines changed: 10 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3523 | 3523 | | |
3524 | 3524 | | |
3525 | 3525 | | |
3526 | | - | |
| 3526 | + | |
3527 | 3527 | | |
3528 | 3528 | | |
3529 | 3529 | | |
| |||
3543 | 3543 | | |
3544 | 3544 | | |
3545 | 3545 | | |
| 3546 | + | |
| 3547 | + | |
| 3548 | + | |
| 3549 | + | |
| 3550 | + | |
| 3551 | + | |
3546 | 3552 | | |
3547 | 3553 | | |
3548 | 3554 | | |
| |||
3587 | 3593 | | |
3588 | 3594 | | |
3589 | 3595 | | |
3590 | | - | |
| 3596 | + | |
3591 | 3597 | | |
3592 | 3598 | | |
3593 | 3599 | | |
| |||
3681 | 3687 | | |
3682 | 3688 | | |
3683 | 3689 | | |
3684 | | - | |
| 3690 | + | |
3685 | 3691 | | |
3686 | 3692 | | |
3687 | | - | |
| 3693 | + | |
3688 | 3694 | | |
3689 | 3695 | | |
3690 | 3696 | | |
| |||
0 commit comments