diff options
| author | Gu Shengxian <gushengxian@yulong.com> | 2021-07-05 18:35:43 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-25 14:36:21 +0200 |
| commit | 782d71e29b2960b0027aca046cd0077998cb54d9 (patch) | |
| tree | 4ec407831afbf270b51d04cf3f94e6b13a731424 /tools | |
| parent | 2381b8e882d067b81560fe368913a4da950698f2 (diff) | |
| download | linux-stable-782d71e29b2960b0027aca046cd0077998cb54d9.tar.gz linux-stable-782d71e29b2960b0027aca046cd0077998cb54d9.tar.bz2 linux-stable-782d71e29b2960b0027aca046cd0077998cb54d9.zip | |
bpftool: Properly close va_list 'ap' by va_end() on error
commit bc832065b60f973771ff3e657214bb21b559833c upstream.
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
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bpf/bpftool/jit_disasm.c | 6 |
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; |