diff options
| author | Andrii Nakryiko <andriin@fb.com> | 2020-01-10 21:19:16 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-01-10 21:38:00 +0300 |
| commit | 1d1a3bcffe360a56fd8cc287ed74d4c3066daf42 (patch) | |
| tree | a5dd199f093ed5cd8a2dd179c2682ea5520b26b5 /tools/lib/bpf/nlattr.c | |
| parent | 7a2d070f91db83a1e08bf212e8f6a34d852efb7f (diff) | |
| download | linux-1d1a3bcffe360a56fd8cc287ed74d4c3066daf42.tar.xz | |
libbpf: Poison kernel-only integer types
It's been a recurring issue with types like u32 slipping into libbpf source
code accidentally. This is not detected during builds inside kernel source
tree, but becomes a compilation error in libbpf's Github repo. Libbpf is
supposed to use only __{s,u}{8,16,32,64} typedefs, so poison {s,u}{8,16,32,64}
explicitly in every .c file. Doing that in a bit more centralized way, e.g.,
inside libbpf_internal.h breaks selftests, which are both using kernel u32 and
libbpf_internal.h.
This patch also fixes a new u32 occurence in libbpf.c, added recently.
Fixes: 590a00888250 ("bpf: libbpf: Add STRUCT_OPS support")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/20200110181916.271446-1-andriin@fb.com
Diffstat (limited to 'tools/lib/bpf/nlattr.c')
| -rw-r--r-- | tools/lib/bpf/nlattr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/lib/bpf/nlattr.c b/tools/lib/bpf/nlattr.c index 8db44bbfc66d..0ad41dfea8eb 100644 --- a/tools/lib/bpf/nlattr.c +++ b/tools/lib/bpf/nlattr.c @@ -13,6 +13,9 @@ #include <string.h> #include <stdio.h> +/* make sure libbpf doesn't use kernel-only integer typedefs */ +#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64 + static uint16_t nla_attr_minlen[LIBBPF_NLA_TYPE_MAX+1] = { [LIBBPF_NLA_U8] = sizeof(uint8_t), [LIBBPF_NLA_U16] = sizeof(uint16_t), |