[PATCH v3] tools: bpftool: close va_list 'ap' by va_end()

[PATCH v3] tools: bpftool: close va_list 'ap' by va_end()

[Gu Shengxian]

From: Gu Shengxian <gushengxian@yulong.com>

va_list 'ap' was opened but not closed by va_end(). It should be
closed by va_end() before return.

According to suggestion of Daniel Borkmann <daniel@iogearbox.net>.
Signed-off-by: Gu Shengxian <gushengxian@yulong.com>
---
 tools/bpf/bpftool/jit_disasm.c | 6 ++++--
 1 file 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;
-- 
2.25.1

Re: [PATCH v3] tools: bpftool: close va_list 'ap' by va_end()

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf.git (refs/heads/master):

On Mon,  5 Jul 2021 18:35:43 -0700 you wrote:
> From: Gu Shengxian <gushengxian@yulong.com>
> 
> va_list 'ap' was opened but not closed by va_end(). It should be
> closed by va_end() before return.
> 
> According to suggestion of Daniel Borkmann <daniel@iogearbox.net>.
> Signed-off-by: Gu Shengxian <gushengxian@yulong.com>
> 
> [...]

Here is the summary with links:
  - [v3] tools: bpftool: close va_list 'ap' by va_end()
    https://git.kernel.org/bpf/bpf/c/519f9d19e135

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html