Messages in this thread Patch in this message |  | | From | Yuntao Wang <> | Subject | [PATCH bpf-next] bpf: Simplify check in btf_parse_hdr() | Date | Sun, 20 Mar 2022 15:52:40 +0800 |
| |
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> --- kernel/bpf/btf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 6d9e711cb5d4..97fd853db16b 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4480,8 +4480,7 @@ static int btf_parse_hdr(struct btf_verifier_env *env) btf = env->btf; btf_data_size = btf->data_size; - if (btf_data_size < - offsetof(struct btf_header, hdr_len) + sizeof(hdr->hdr_len)) { + if (btf_data_size < offsetofend(struct btf_header, hdr_len)) { btf_verifier_log(env, "hdr_len not found"); return -EINVAL; } -- 2.35.1
|  |