Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux.git] / kernel / bpf / btf.c

diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index adb3adcebe3c5ac0707ed38c8a184504b67aa2f7..29c7c06c6bd60cb21195ec42425938f39867150e 100644 (file)
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -2332,7 +2332,7 @@ static int btf_enum_check_kflag_member(struct btf_verifier_env *env,
                if (BITS_PER_BYTE_MASKED(struct_bits_off)) {
                        btf_verifier_log_member(env, struct_type, member,
                                                "Member is not byte aligned");
-                               return -EINVAL;
+                       return -EINVAL;
                }
 
                nr_bits = int_bitsize;
@@ -2377,9 +2377,8 @@ static s32 btf_enum_check_meta(struct btf_verifier_env *env,
                return -EINVAL;
        }
 
-       if (t->size != sizeof(int)) {
-               btf_verifier_log_type(env, t, "Expected size:%zu",
-                                     sizeof(int));
+       if (t->size > 8 || !is_power_of_2(t->size)) {
+               btf_verifier_log_type(env, t, "Unexpected size");
                return -EINVAL;
        }