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

Commit 609320c8 authored by Yonghong Song's avatar Yonghong Song Committed by David S. Miller
Browse files

perf/bpf: fix a clang compilation issue 



clang does not support variable length array for structure member.
It has the following error during compilation:

kernel/trace/trace_syscalls.c:568:17: error: fields must have a constant size:
'variable length array in structure' extension will never be supported
                unsigned long args[sys_data->nb_args];
                              ^

The fix is to use a fixed array length instead.

Reported-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: default avatarYonghong Song <yhs@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6644d07

include/linux/syscalls.h

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event) 
#define SYSCALL_DEFINE5(name, ...) SYSCALL_DEFINEx(5, _##name, __VA_ARGS__)

#define SYSCALL_DEFINE6(name, ...) SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)



#define SYSCALL_DEFINE_MAXARGS	6



#define SYSCALL_DEFINEx(x, sname, ...)				\

	SYSCALL_METADATA(sname, x, __VA_ARGS__)			\

	__SYSCALL_DEFINEx(x, sname, __VA_ARGS__)

kernel/trace/trace_syscalls.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int perf_call_bpf_enter(struct bpf_prog *prog, struct pt_regs *regs, 
	struct syscall_tp_t {

		unsigned long long regs;

		unsigned long syscall_nr;

		unsigned long args[sys_data->nb_args];

		unsigned long args[SYSCALL_DEFINE_MAXARGS];

	} param;

	int i;