Skip to content

Commit 797d73e

Browse files
Hou TaoAlexei Starovoitov
authored andcommitted
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

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

kernel/bpf/btf.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3523,7 +3523,7 @@ static int btf_get_field_type(const struct btf *btf, const struct btf_type *var_
35233523
* (i + 1) * elem_size
35243524
* where i is the repeat index and elem_size is the size of an element.
35253525
*/
3526-
static int btf_repeat_fields(struct btf_field_info *info,
3526+
static int btf_repeat_fields(struct btf_field_info *info, int info_cnt,
35273527
u32 field_cnt, u32 repeat_cnt, u32 elem_size)
35283528
{
35293529
u32 i, j;
@@ -3543,6 +3543,12 @@ static int btf_repeat_fields(struct btf_field_info *info,
35433543
}
35443544
}
35453545

3546+
/* The type of struct size or variable size is u32,
3547+
* so the multiplication will not overflow.
3548+
*/
3549+
if (field_cnt * (repeat_cnt + 1) > info_cnt)
3550+
return -E2BIG;
3551+
35463552
cur = field_cnt;
35473553
for (i = 0; i < repeat_cnt; i++) {
35483554
memcpy(&info[cur], &info[0], field_cnt * sizeof(info[0]));
@@ -3587,7 +3593,7 @@ static int btf_find_nested_struct(const struct btf *btf, const struct btf_type *
35873593
info[i].off += off;
35883594

35893595
if (nelems > 1) {
3590-
err = btf_repeat_fields(info, ret, nelems - 1, t->size);
3596+
err = btf_repeat_fields(info, info_cnt, ret, nelems - 1, t->size);
35913597
if (err == 0)
35923598
ret *= nelems;
35933599
else
@@ -3681,10 +3687,10 @@ static int btf_find_field_one(const struct btf *btf,
36813687

36823688
if (ret == BTF_FIELD_IGNORE)
36833689
return 0;
3684-
if (nelems > info_cnt)
3690+
if (!info_cnt)
36853691
return -E2BIG;
36863692
if (nelems > 1) {
3687-
ret = btf_repeat_fields(info, 1, nelems - 1, sz);
3693+
ret = btf_repeat_fields(info, info_cnt, 1, nelems - 1, sz);
36883694
if (ret < 0)
36893695
return ret;
36903696
}

0 commit comments

Comments
 (0)