Skip to content

Commit 4c80c7b

Browse files
arndbborkmann
authored andcommitted
bpf: Fix build in minimal configurations, again
Building with -Werror showed another failure: kernel/bpf/btf.c: In function 'btf_get_prog_ctx_type.isra.31': kernel/bpf/btf.c:3508:63: error: array subscript 0 is above array bounds of 'u8[0]' {aka 'unsigned char[0]'} [-Werror=array-bounds] ctx_type = btf_type_member(conv_struct) + bpf_ctx_convert_map[prog_type] * 2; I don't actually understand why the array is empty, but a similar fix has addressed a related problem, so I suppose we can do the same thing here. Fixes: ce27709 ("bpf: Fix build in minimal configurations") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Martin KaFai Lau <kafai@fb.com> Link: https://lore.kernel.org/bpf/20191210203553.2941035-1-arnd@arndb.de
1 parent e49e6f6 commit 4c80c7b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

kernel/bpf/btf.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3470,6 +3470,7 @@ static u8 bpf_ctx_convert_map[] = {
34703470
[_id] = __ctx_convert##_id,
34713471
#include <linux/bpf_types.h>
34723472
#undef BPF_PROG_TYPE
3473+
0, /* avoid empty array */
34733474
};
34743475
#undef BPF_MAP_TYPE
34753476

0 commit comments

Comments
 (0)