]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
libbpf: Fix warning in calloc() usage
authorMatteo Croce <teknoraver@meta.com>
Thu, 17 Jul 2025 20:03:37 +0000 (22:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:41:07 +0000 (18:41 +0200)
[ 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 <teknoraver@meta.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Yonghong Song <yonghong.song@linux.dev>
Link: https://lore.kernel.org/bpf/20250717200337.49168-1-technoboy85@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/lib/bpf/libbpf.c

index 6401dd3bd35fafcb74a6f4a9725da2343c2c95d9..8fe427960eee431b7ace599d17eedb1b2648ceae 100644 (file)
@@ -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;