From: Yuan Chen <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: Yuan Chen <chenyuan@kylinos.cn>
Suggested-by: Quentin Monnet <qmo@kernel.org>
---
 tools/bpf/bpftool/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
index cd5963cb6058..33c68eccd2c3 100644
--- a/tools/bpf/bpftool/main.c
+++ b/tools/bpf/bpftool/main.c
@@ -533,8 +533,12 @@ int main(int argc, char **argv)
 	if (argc < 0)
 		usage();
 
-	if (version_requested)
-		return do_version(argc, argv);
+	if (version_requested) {
+		ret = do_version(argc, argv);
+		if (json_output)
+			jsonw_destroy(&json_wtr);
+		return ret;
+	}
 
 	ret = cmd_select(commands, argc, argv, do_help);
 
-- 
2.44.0

On Mon, Jun 16, 2025 at 8:30 AM Yuan Chen <chenyuan_fl@163.com> wrote:
>
> From: Yuan Chen <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: Yuan Chen <chenyuan@kylinos.cn>
> Suggested-by: Quentin Monnet <qmo@kernel.org>
> ---
>  tools/bpf/bpftool/main.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c
> index cd5963cb6058..33c68eccd2c3 100644
> --- a/tools/bpf/bpftool/main.c
> +++ b/tools/bpf/bpftool/main.c
> @@ -533,8 +533,12 @@ int main(int argc, char **argv)
>         if (argc < 0)
>                 usage();
>
> -       if (version_requested)
> -               return do_version(argc, argv);
> +       if (version_requested) {
> +               ret = do_version(argc, argv);
> +               if (json_output)
> +                       jsonw_destroy(&json_wtr);
> +               return ret;
> +       }

there is also btf__free(base_btf), so instead of jsonw_destroy copy,
let's maybe just do

if (version_requested)
    ret = do_version(...);
else
    ret = cmd_select(...);

jsonw_destroy, btf__free...

return ret;

pw-bot: cr


>
>         ret = cmd_select(commands, argc, argv, do_help);
>
> --
> 2.44.0
>
>

2025-06-16 11:27 UTC-0400 ~ Yuan Chen <chenyuan_fl@163.com>
> From: Yuan Chen <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: Yuan Chen <chenyuan@kylinos.cn>
> Suggested-by: Quentin Monnet <qmo@kernel.org>

Thanks a lot! Please, for future patches, state the version of your
patch (if > 1) in the prefix of your email subject:

	[PATCH bpf-next v2] bpftool: Fix JSON writer...

Reviewed-by: Quentin Monnet <qmo@kernel.org>