* [PATCH] tools: bpftool: close va_list 'ap' by va_end()
@ 2021-07-01 12:00 gushengxian
2021-07-05 20:58 ` Daniel Borkmann
0 siblings, 1 reply; 2+ messages in thread
From: gushengxian @ 2021-07-01 12:00 UTC (permalink / raw)
To: ast, daniel, andrii; +Cc: netdev, bpf, linux-kernel, gushengxian
From: gushengxian <gushengxian@yulong.com>
va_list 'ap' was opened but not closed by va_end(). It should be
closed by va_end() before return.
Signed-off-by: gushengxian <gushengxian@yulong.com>
---
tools/bpf/bpftool/jit_disasm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/bpf/bpftool/jit_disasm.c b/tools/bpf/bpftool/jit_disasm.c
index e7e7eee9f172..3c85fd1f00cb 100644
--- a/tools/bpf/bpftool/jit_disasm.c
+++ b/tools/bpf/bpftool/jit_disasm.c
@@ -45,8 +45,10 @@ static int fprintf_json(void *out, const char *fmt, ...)
char *s;
va_start(ap, fmt);
- if (vasprintf(&s, fmt, ap) < 0)
+ if (vasprintf(&s, fmt, ap) < 0) {
+ va_end(ap);
return -1;
+ }
va_end(ap);
if (!oper_count) {
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tools: bpftool: close va_list 'ap' by va_end()
2021-07-01 12:00 [PATCH] tools: bpftool: close va_list 'ap' by va_end() gushengxian
@ 2021-07-05 20:58 ` Daniel Borkmann
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Borkmann @ 2021-07-05 20:58 UTC (permalink / raw)
To: gushengxian, ast, andrii; +Cc: netdev, bpf, linux-kernel, gushengxian
On 7/1/21 2:00 PM, gushengxian wrote:
> From: gushengxian <gushengxian@yulong.com>
>
> va_list 'ap' was opened but not closed by va_end(). It should be
> closed by va_end() before return.
>
> Signed-off-by: gushengxian <gushengxian@yulong.com>
nit: 'From:' and 'SoB:' should be in standardized form, I presume in your case
this would be:
Gu Shengxian <gushengxian@yulong.com>
> ---
> tools/bpf/bpftool/jit_disasm.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/bpf/bpftool/jit_disasm.c b/tools/bpf/bpftool/jit_disasm.c
> index e7e7eee9f172..3c85fd1f00cb 100644
> --- a/tools/bpf/bpftool/jit_disasm.c
> +++ b/tools/bpf/bpftool/jit_disasm.c
> @@ -45,8 +45,10 @@ static int fprintf_json(void *out, const char *fmt, ...)
> char *s;
>
> va_start(ap, fmt);
> - if (vasprintf(&s, fmt, ap) < 0)
> + if (vasprintf(&s, fmt, ap) < 0) {
> + va_end(ap);
> return -1;
> + }
> va_end(ap);
Small nit, please change into something like:
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;
Fwiw, man page says: "On some systems, va_end contains a closing '}' matching a '{' in
va_start, so that both macros must occur in the same function, and in a way that allows
this.".
Thanks,
Daniel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-05 20:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-01 12:00 [PATCH] tools: bpftool: close va_list 'ap' by va_end() gushengxian
2021-07-05 20:58 ` Daniel Borkmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.