summaryrefslogtreecommitdiffstats
path: root/tools/bpf
diff options
context:
space:
mode:
authorGu Shengxian <gushengxian@yulong.com>2021-07-06 03:35:43 +0200
committerDaniel Borkmann <daniel@iogearbox.net>2021-07-06 09:19:23 +0200
commitbc832065b60f973771ff3e657214bb21b559833c (patch)
tree6012d60d732d9e6078196c6215922685876383cb /tools/bpf
parentbpf, samples: Fix xdpsock with '-M' parameter missing unload process (diff)
downloadlinux-bc832065b60f973771ff3e657214bb21b559833c.tar.xz
linux-bc832065b60f973771ff3e657214bb21b559833c.zip
bpftool: Properly close va_list 'ap' by va_end() on error
va_list 'ap' was opened but not closed by va_end() in error case. It should be closed by va_end() before the return. Fixes: aa52bcbe0e72 ("tools: bpftool: Fix json dump crash on powerpc") Signed-off-by: Gu Shengxian <gushengxian@yulong.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Cc: Jiri Olsa <jolsa@redhat.com> Link: https://lore.kernel.org/bpf/20210706013543.671114-1-gushengxian507419@gmail.com
Diffstat (limited to 'tools/bpf')
-rw-r--r--tools/bpf/bpftool/jit_disasm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/bpf/bpftool/jit_disasm.c b/tools/bpf/bpftool/jit_disasm.c
index e7e7eee9f172..24734f2249d6 100644
--- a/tools/bpf/bpftool/jit_disasm.c
+++ b/tools/bpf/bpftool/jit_disasm.c
@@ -43,11 +43,13 @@ static int fprintf_json(void *out, const char *fmt, ...)
{
va_list ap;
char *s;
+ int err;
va_start(ap, fmt);
- if (vasprintf(&s, fmt, ap) < 0)
- return -1;
+ err = vasprintf(&s, fmt, ap);
va_end(ap);
+ if (err < 0)
+ return -1;
if (!oper_count) {
int i;