Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

bpf: Simplify check in btf_parse_hdr()

Browse Source 
Replace offsetof(hdr_len) + sizeof(hdr_len) with offsetofend(hdr_len) to
simplify the check for correctness of btf_data_size in btf_parse_hdr()

Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20220320075240.1001728-1-ytcoode@gmail.com
This commit is contained in:
Yuntao Wang 2022-03-20 15:52:40 +08:00 committed by Daniel Borkmann
parent ec80906b0f
commit 583669ab3a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/bpf/btf.c
View File

@ -4482,8 +4482,7 @@ static int btf_parse_hdr(struct btf_verifier_env *env)
btf = env->btf; btf = env->btf;
btf_data_size = btf->data_size; btf_data_size = btf->data_size;
if (btf_data_size < if (btf_data_size < offsetofend(struct btf_header, hdr_len)) {
offsetof(struct btf_header, hdr_len) + sizeof(hdr->hdr_len)) {
btf_verifier_log(env, "hdr_len not found"); btf_verifier_log(env, "hdr_len not found");
return -EINVAL; return -EINVAL;
} }