mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Quentin Monnet <qmo@kernel.org>
To: Yuan Chen <chenyuan_fl@163.com>, ast@kernel.org
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
	chenyuan <chenyuan@kylinos.cn>
Subject: Re: [PATCH] bpftool: Fix JSON writer resource leak in version command
Date: Mon, 16 Jun 2025 15:24:49 +0100	[thread overview]
Message-ID: <47585e99-062b-4745-bbd9-b48e734bc631@kernel.org> (raw)
In-Reply-To: <20250616135014.12327-1-chenyuan_fl@163.com>

2025-06-16 09:50 UTC-0400 ~ Yuan Chen <chenyuan_fl@163.com>
> From: chenyuan <chenyuan@kylinos.cn>
> 
> When using `bpftool --version -j/-p`, the JSON writer object
> created in do_version() was not properly destroyed after use.
> This caused a memory leak each time the version command was
> executed with JSON output.
> 
> Fix: 004b45c0e51a (tools: bpftool: provide JSON output for all possible commands)
> Signed-off-by: chenyuan <chenyuan@kylinos.cn>
> ---
>  tools/bpf/bpftool/main.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
> index cd5963cb6058..c8838196a3bd 100644
> --- a/tools/bpf/bpftool/main.c
> +++ b/tools/bpf/bpftool/main.c
> @@ -164,6 +164,7 @@ static int do_version(int argc, char **argv)
>  		jsonw_end_object(json_wtr);	/* features */
>  
>  		jsonw_end_object(json_wtr);	/* root object */
> +		jsonw_destroy(&json_wtr);
>  	} else {
>  		unsigned int nb_features = 0;
>  


Good catch, but the fix is not correct:

	$ ./bpftool version -j >/dev/null
	zsh: segmentation fault (core dumped)

This is because we already run jsonw_destroy() at the end of the main()
function when printing the version with "bpftool version", the command
(and not the -V or --version options).

One option would be to add a call at the end of main(), when we call
do_version() because "version_requested" is set:

	if (version_requested) {
		do_version(argc, argv);
		if (json_output)
			jsonw_destroy(&json_wtr);
		return 0;
	}

Thanks,
Quentin

pw-bot: cr

  reply	other threads:[~2025-06-16 14:24 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-16 13:50 Yuan Chen
2025-06-16 14:24 ` Quentin Monnet [this message]
2025-06-16 15:27 Yuan Chen
2025-06-16 15:50 ` Quentin Monnet
2025-06-16 21:19 ` Andrii Nakryiko

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=47585e99-062b-4745-bbd9-b48e734bc631@kernel.org \
    --to=qmo@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=chenyuan@kylinos.cn \
    --cc=chenyuan_fl@163.com \
    --cc=linux-kernel@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®