Commit 95064979 authored Jun 26, 2019 by Ivan Khoronzhuk Committed by Daniel Borkmann Jun 26, 2019

libbpf: fix max() type mismatch for 32bit



It fixes build error for 32bit caused by type mismatch
size_t/unsigned long.

Fixes: bf829271 ("libbpf: refactor map initialization")
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent 9cda7807

tools/lib/bpf/libbpf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -778,7 +778,7 @@ static struct bpf_map bpf_object__add_map(struct bpf_object obj)
		if (obj->nr_maps < obj->maps_cap)
		return &obj->maps[obj->nr_maps++];

		new_cap = max(4ul, obj->maps_cap * 3 / 2);
		new_cap = max((size_t)4, obj->maps_cap * 3 / 2);
		new_maps = realloc(obj->maps, new_cap * sizeof(*obj->maps));
		if (!new_maps) {
		pr_warning("alloc maps for object failed\n");

Admin message