This is a note to let you know that I've just added the patch titled
bpftool: Properly close va_list 'ap' by va_end() on error
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bpftool-properly-close-va_list-ap-by-va_end-on-error.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From bc832065b60f973771ff3e657214bb21b559833c Mon Sep 17 00:00:00 2001
From: Gu Shengxian <gushengxian@xxxxxxxxxx>
Date: Mon, 5 Jul 2021 18:35:43 -0700
Subject: bpftool: Properly close va_list 'ap' by va_end() on error
From: Gu Shengxian <gushengxian@xxxxxxxxxx>
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@xxxxxxxxxx>
Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Link: https://lore.kernel.org/bpf/20210706013543.671114-1-gushengxian507419@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/bpf/bpftool/jit_disasm.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- 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
{
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;
Patches currently in stable-queue which might be from gushengxian@xxxxxxxxxx are
queue-5.10/bpftool-properly-close-va_list-ap-by-va_end-on-error.patch
queue-5.10/perf-x86-intel-uncore-clean-up-error-handling-path-o.patch
