]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpftool: Silence build warning about calloc()
authorTiezhu Yang <yangtiezhu@loongson.cn>
Tue, 16 Jan 2024 06:19:20 +0000 (14:19 +0800)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:19:22 +0000 (18:19 -0400)
commite9a89238b9fb1054449e9031a5a37a1de14a71dc
tree72dddb8c1e237419a9343a13808e7a3a554ab8e7
parent9311cc6658b1a392cdcf8202421f7f62f37cb525
bpftool: Silence build warning about calloc()

[ Upstream commit f5f30386c78105cba520e443a6a9ee945ec1d066 ]

There exists the following warning when building bpftool:

  CC      prog.o
prog.c: In function ‘profile_open_perf_events’:
prog.c:2301:24: warning: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args]
 2301 |                 sizeof(int), obj->rodata->num_cpu * obj->rodata->num_metric);
      |                        ^~~
prog.c:2301:24: note: earlier argument should specify number of elements, later size of each element

Tested with the latest upstream GCC which contains a new warning option
-Wcalloc-transposed-args. The first argument to calloc is documented to
be number of elements in array, while the second argument is size of each
element, just switch the first and second arguments of calloc() to silence
the build warning, compile tested only.

Fixes: 47c09d6a9f67 ("bpftool: Introduce "prog profile" command")
Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Link: https://lore.kernel.org/bpf/20240116061920.31172-1-yangtiezhu@loongson.cn
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/bpf/bpftool/prog.c