linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Borkmann <daniel@iogearbox.net>
To: gushengxian <gushengxian507419@gmail.com>,
	ast@kernel.org, andrii@kernel.org
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	gushengxian <gushengxian@yulong.com>
Subject: Re: [PATCH] tools: bpftool: close va_list 'ap' by va_end()
Date: Mon, 5 Jul 2021 22:58:53 +0200	[thread overview]
Message-ID: <bc835003-6497-4c7c-731c-738c632acdda@iogearbox.net> (raw)
In-Reply-To: <20210701120026.709862-1-gushengxian507419@gmail.com>

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

      reply	other threads:[~2021-07-05 20:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-01 12:00 gushengxian
2021-07-05 20:58 ` Daniel Borkmann [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bc835003-6497-4c7c-731c-738c632acdda@iogearbox.net \
    --to=daniel@iogearbox.net \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=gushengxian507419@gmail.com \
    --cc=gushengxian@yulong.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --subject='Re: [PATCH] tools: bpftool: close va_list '\''ap'\'' by va_end()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).