Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / tools / lib / bpf / btf_dump.c

diff --git a/tools/lib/bpf/btf_dump.c b/tools/lib/bpf/btf_dump.c
index 57c00fa..6c079b3 100644 (file)
--- a/tools/lib/bpf/btf_dump.c
+++ b/tools/lib/bpf/btf_dump.c
@@ -19,9 +19,6 @@
 #include "libbpf.h"
 #include "libbpf_internal.h"
 
-/* make sure libbpf doesn't use kernel-only integer typedefs */
-#pragma GCC poison u8 u16 u32 u64 s8 s16 s32 s64
-
 static const char PREFIXES[] = "\t\t\t\t\t\t\t\t\t\t\t\t\t";
 static const size_t PREFIX_CNT = sizeof(PREFIXES) - 1;
 
@@ -323,8 +320,7 @@ static int btf_dump_add_emit_queue_id(struct btf_dump *d, __u32 id)
 
        if (d->emit_queue_cnt >= d->emit_queue_cap) {
                new_cap = max(16, d->emit_queue_cap * 3 / 2);
-               new_queue = realloc(d->emit_queue,
-                                   new_cap * sizeof(new_queue[0]));
+               new_queue = libbpf_reallocarray(d->emit_queue, new_cap, sizeof(new_queue[0]));
                if (!new_queue)
                        return -ENOMEM;
                d->emit_queue = new_queue;
@@ -1003,8 +999,7 @@ static int btf_dump_push_decl_stack_id(struct btf_dump *d, __u32 id)
 
        if (d->decl_stack_cnt >= d->decl_stack_cap) {
                new_cap = max(16, d->decl_stack_cap * 3 / 2);
-               new_stack = realloc(d->decl_stack,
-                                   new_cap * sizeof(new_stack[0]));
+               new_stack = libbpf_reallocarray(d->decl_stack, new_cap, sizeof(new_stack[0]));
                if (!new_stack)
                        return -ENOMEM;
                d->decl_stack = new_stack;