bpftool: Fix JSON writer resource leak in version command

[ Upstream commit 85cd83fed8 ]

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: 004b45c0e5 (tools: bpftool: provide JSON output for all possible commands)

Suggested-by: Quentin Monnet <qmo@kernel.org>
Signed-off-by: Yuan Chen <chenyuan@kylinos.cn>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Reviewed-by: Quentin Monnet <qmo@kernel.org>
Link: https://lore.kernel.org/bpf/20250617132442.9998-1-chenyuan_fl@163.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yuan Chen 2025-06-17 09:24:42 -04:00 committed by Greg Kroah-Hartman
parent e1e86785d7
commit 04059932fb

View File

@ -534,9 +534,9 @@ int main(int argc, char **argv)
usage();
if (version_requested)
return do_version(argc, argv);
ret = cmd_select(commands, argc, argv, do_help);
ret = do_version(argc, argv);
else
ret = cmd_select(commands, argc, argv, do_help);
if (json_output)
jsonw_destroy(&json_wtr);