From: Matteo Croce Date: Thu, 17 Jul 2025 20:03:37 +0000 (+0200) Subject: libbpf: Fix warning in calloc() usage X-Git-Tag: v6.16.2~344 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68c4dd208875aeea90f48b40f2cf841de6f94c2b;p=thirdparty%2Fkernel%2Fstable.git libbpf: Fix warning in calloc() usage [ Upstream commit 0ee30d937c147fc14c4b49535181d437cd2fde7a ] When compiling libbpf with some compilers, this warning is triggered: libbpf.c: In function ‘bpf_object__gen_loader’: libbpf.c:9209:28: error: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Werror=calloc-transposed-args] 9209 | gen = calloc(sizeof(*gen), 1); | ^ libbpf.c:9209:28: note: earlier argument should specify number of elements, later size of each element Fix this by inverting the calloc() arguments. Signed-off-by: Matteo Croce Signed-off-by: Andrii Nakryiko Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20250717200337.49168-1-technoboy85@gmail.com Signed-off-by: Sasha Levin --- diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 6401dd3bd35fa..8fe427960eee4 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -9221,7 +9221,7 @@ int bpf_object__gen_loader(struct bpf_object *obj, struct gen_loader_opts *opts) return libbpf_err(-EFAULT); if (!OPTS_VALID(opts, gen_loader_opts)) return libbpf_err(-EINVAL); - gen = calloc(sizeof(*gen), 1); + gen = calloc(1, sizeof(*gen)); if (!gen) return libbpf_err(-ENOMEM); gen->opts = opts;