From nobody Thu Oct 9 13:51:36 2025 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E49462E7166; Tue, 17 Jun 2025 13:25:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750166710; cv=none; b=PPIV95ouBg0xaRLvDXllZXxLwgNol1gt/vY6SgYp62SNPrkIcRUoonNV7kGo9wM7eZqgY676gG+8h3W2HFuxz5cp9d+fjbXunoG6CjHsPIOxreKZ8TH57r1Uy4d/HfKzdNOBjrsSBGMU2H2MXnUjv1tl8MwEL/enzTMmKqrjAtk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750166710; c=relaxed/simple; bh=RmrrBUhQK/F0CR0LTZYtJ33BjAy7vBJTZYBL3luAHGI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=G+lgremawxQl5B4gsJDLALrzd0sboHuj9nUJZ00yHMx/x6MQT1quAHx4Ld/cBuNedQg4IpmJMfw7t2zWqRaxanWo6Ntb8srjnkeE2ZAfw3erGPvv7HeTUrc1WjgougtpfjIW7l202e+6NBr3ZGqOCR/JPGHSPQ7dPZiOWb2RMEU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=VlH7XHGh; arc=none smtp.client-ip=220.197.31.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="VlH7XHGh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=Lm pbemX3u8079iJRrn/7u7HJzynrGfcLLZNVkf7/pEk=; b=VlH7XHGhIZJoG2XeeV Qv7gR9lnDdsUNLetlA/CnUdRLwiixlcHU0OLcBPMlLEy+96Gs+yXIAE0qjz9CGex ZtKf9NneNPVIKM/2Qeio+ABjBBmNTqkDxyuDvf24TagO+xyLHDbUmhhJzx2RkKNe 8j96htyuFZmw8q8/Cz/kPph+Q= Received: from 192.168.0.118 (unknown []) by gzsmtp5 (Coremail) with SMTP id QCgvCgBHOcKbbFFog+8sAA--.6914S2; Tue, 17 Jun 2025 21:24:45 +0800 (CST) From: Yuan Chen To: qmo@kernel.org, ast@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, andrii.nakryiko@gmail.com, chenyuan_fl@163.com, Yuan Chen Subject: [PATCH v2] bpftool: Fix JSON writer resource leak in version command Date: Tue, 17 Jun 2025 09:24:42 -0400 Message-ID: <20250617132442.9998-1-chenyuan_fl@163.com> X-Mailer: git-send-email 2.44.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: QCgvCgBHOcKbbFFog+8sAA--.6914S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Jr47GrWDGr4rAryDAr1xuFg_yoWDZwcEgr srXr4kXrWrKrWxJw40k398urW0yayxGw4DGr17tF13JF18trsxJr1DC39Iyas8uFWUGrna yFs3AryfGa13CjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRNzuAUUUUUU== X-CM-SenderInfo: xfkh05pxdqswro6rljoofrz/1tbiJwFvvWhRZDzGuAAAsr Content-Type: text/plain; charset="utf-8" From: Yuan Chen 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 com= mands) Signed-off-by: Yuan Chen Suggested-by: Quentin Monnet Reviewed-by: Quentin Monnet --- tools/bpf/bpftool/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index cd5963cb6058..2b7f2bd3a7db 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c @@ -534,9 +534,9 @@ int main(int argc, char **argv) usage(); =20 if (version_requested) - return do_version(argc, argv); - - ret =3D cmd_select(commands, argc, argv, do_help); + ret =3D do_version(argc, argv); + else + ret =3D cmd_select(commands, argc, argv, do_help); =20 if (json_output) jsonw_destroy(&json_wtr); --=20 2.44.0