From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 334A5EEB568 for ; Fri, 8 Sep 2023 19:12:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344475AbjIHTMf (ORCPT ); Fri, 8 Sep 2023 15:12:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234188AbjIHTMY (ORCPT ); Fri, 8 Sep 2023 15:12:24 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64EE0E6B; Fri, 8 Sep 2023 12:12:18 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23264C116B4; Fri, 8 Sep 2023 18:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694196915; bh=r79lwaELI4Gs1WB8QGgVqDIUBX3aGVfUv/JCqb98c6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qs0hVxwxHPdXspX1Oy58C19h6t3F2bQp9VjahmbmLWdg5iJQIZ+USc855z9lRxls6 GLYWhStxwzDROELhCX/DKbWQuxztgDVQXZjOC0xcw6e99R1ToiVf/3hslNqo9lvLBO 8LVdOvbg9Pf7aXijJWUoy3g+4H/aJEvkHtVPX2HF3CEKgPvT07qoV5LKCjNJpqqFBn ZRbz+z1N8K49YlTLarCnhzVyUaYoi/5zAh5up4Hlg/AYrXFVlkuk1bemsZjG/AB+6X 1qRCGkp2tEhi2Z2RrxOmw9OShLAweqFt7XazhtdFHbajv1qVszOWoOCC3xH+FyQGsW +ZQp58IPKpeiw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hao Luo , Andrii Nakryiko , Sasha Levin , ast@kernel.org, daniel@iogearbox.net, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 39/45] libbpf: Free btf_vmlinux when closing bpf_object Date: Fri, 8 Sep 2023 14:13:20 -0400 Message-Id: <20230908181327.3459042-39-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230908181327.3459042-1-sashal@kernel.org> References: <20230908181327.3459042-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.2 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hao Luo [ Upstream commit 29d67fdebc42af6466d1909c60fdd1ef4f3e5240 ] I hit a memory leak when testing bpf_program__set_attach_target(). Basically, set_attach_target() may allocate btf_vmlinux, for example, when setting attach target for bpf_iter programs. But btf_vmlinux is freed only in bpf_object_load(), which means if we only open bpf object but not load it, setting attach target may leak btf_vmlinux. So let's free btf_vmlinux in bpf_object__close() anyway. Signed-off-by: Hao Luo Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20230822193840.1509809-1-haoluo@google.com Signed-off-by: Sasha Levin --- tools/lib/bpf/libbpf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 214f828ece6bf..83bb099d58253 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -8352,6 +8352,7 @@ void bpf_object__close(struct bpf_object *obj) bpf_object__elf_finish(obj); bpf_object_unload(obj); btf__free(obj->btf); + btf__free(obj->btf_vmlinux); btf_ext__free(obj->btf_ext); for (i = 0; i < obj->nr_maps; i++) -- 2.40.1