bpf: Simplify check in btf_parse_hdr()
Subsystems (3)
PATCH 1/1 bpf: Simplify check in btf_parse_hdr()
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 <[email protected]>
--- kernel/bpf/btf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/bpf/btf.c +1 -2
@@ -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 ; }
Signature · 1 line
2.35.1
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 7 lines · On Sun, 20 Mar 2022 15:52:40 +0800 you wrote:
Replace
offsetof(hdr_len)+sizeof(hdr_len)withoffsetofend(hdr_len)to simplify the check for correctness ofbtf_data_sizeinbtf_parse_hdr()Signed-off-by Yuntao Wang <[email protected]>--- kernel/bpf/btf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Here is the summary with links:
- [bpf-next] bpf: Simplify check in btf_parse_hdr()
https://git.kernel.org/bpf/bpf-next/c/583669ab3aed
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html