xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bpf: btf: fix truncated last_member_type_id in btf_struct_resolve

Browse Source 
[ Upstream commit a37a32583e282d8d815e22add29bc1e91e19951a ]

When trying to finish resolving a struct member, btf_struct_resolve
saves the member type id in a u16 temporary variable. This truncates
the 32 bit type id value if it exceeds UINT16_MAX.

As a result, structs that have members with type ids > UINT16_MAX and
which need resolution will fail with a message like this:

    [67414] STRUCT ff_device size=120 vlen=12
        effect_owners type_id=67434 bits_offset=960 Member exceeds struct_size

Fix this by changing the type of last_member_type_id to u32.

Fixes: a0791f0df7 ("bpf: fix BTF limits")
Reviewed-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: Lorenz Bauer <oss@lmb.io>
Link: https://lore.kernel.org/r/20220910110120.339242-1-oss@lmb.io
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Lorenz Bauer
2022-09-10 11:01:20 +00:00
committed by Greg Kroah-Hartman
parent 8398a45d3d
commit 0a60ac7a0d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/bpf/btf.c
View File

@@ -2913,7 +2913,7 @@ static int btf_struct_resolve(struct btf_verifier_env *env,
if (v->next_member) { if (v->next_member) {
const struct btf_type *last_member_type; const struct btf_type *last_member_type;
const struct btf_member *last_member; const struct btf_member *last_member;
u16 last_member_type_id; u32 last_member_type_id;
last_member = btf_type_member(v->t) + v->next_member - 1; last_member = btf_type_member(v->t) + v->next_member - 1;
last_member_type_id = last_member->type; last_member_type_id = last_member->type;