From: Yoshiki Komachi Date: Tue, 10 Mar 2020 07:32:29 +0000 (+0900) Subject: bpf/btf: Fix BTF verification of enum members in struct/union X-Git-Tag: v5.5.14~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6d200f3fad829c23acd092f405936d50c475c06;p=thirdparty%2Fkernel%2Fstable.git bpf/btf: Fix BTF verification of enum members in struct/union commit da6c7faeb103c493e505e87643272f70be586635 upstream. btf_enum_check_member() was currently sure to recognize the size of "enum" type members in struct/union as the size of "int" even if its size was packed. This patch fixes BTF enum verification to use the correct size of member in BPF programs. Fixes: 179cde8cef7e ("bpf: btf: Check members of struct/union") Signed-off-by: Yoshiki Komachi Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/1583825550-18606-2-git-send-email-komachi.yoshiki@gmail.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index ed20758847247..9bf372120e127 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -2383,7 +2383,7 @@ static int btf_enum_check_member(struct btf_verifier_env *env, struct_size = struct_type->size; bytes_offset = BITS_ROUNDDOWN_BYTES(struct_bits_off); - if (struct_size - bytes_offset < sizeof(int)) { + if (struct_size - bytes_offset < member_type->size) { btf_verifier_log_member(env, struct_type, member, "Member exceeds struct_size"); return -EINVAL;