Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93697d41 authored by Yoshiki Komachi's avatar Yoshiki Komachi Committed by Harshit Jain
Browse files

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: 179cde8c ("bpf: btf: Check members of struct/union")
Signed-off-by: default avatarYoshiki Komachi <komachi.yoshiki@gmail.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/1583825550-18606-2-git-send-email-komachi.yoshiki@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: default avatarCyber Knight <cyberknight755@gmail.com>
parent b55992e7

kernel/bpf/btf.c

+1 −1
Original line number Diff line number Diff line
@@ -1650,7 +1650,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;