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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D29DC433F5 for ; Mon, 15 Nov 2021 23:03:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42D1060F9B for ; Mon, 15 Nov 2021 23:03:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350766AbhKOXGA (ORCPT ); Mon, 15 Nov 2021 18:06:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:59080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243413AbhKOS6p (ORCPT ); Mon, 15 Nov 2021 13:58:45 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4A82763492; Mon, 15 Nov 2021 18:12:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636999979; bh=gPkwpd7b4c6P1/eV9B35m3AKMWld1jT9JTjcb3qBCHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cni6K8XY8rWJmDA4Mi6JO9CPxLAO9n972hXF/4EJwSbpXnX3scP9qUqlVnJFSPzxJ I2ENmLvtMH0q0hO3Oeu0zgMZ8npVEOFI80/viqATvxMwR4M7pf9b8gYd6W4t6rWryT fzg+J4CjrJBNifvb8mkXB9yaFBgSJ+yLiqEQy9f8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Mauricio=20V=C3=A1squez?= , Andrii Nakryiko , Sasha Levin Subject: [PATCH 5.14 492/849] libbpf: Fix memory leak in btf__dedup() Date: Mon, 15 Nov 2021 17:59:35 +0100 Message-Id: <20211115165436.922603661@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165419.961798833@linuxfoundation.org> References: <20211115165419.961798833@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mauricio Vásquez [ Upstream commit 1000298c76830bc291358e98e8fa5baa3baa9b3a ] Free btf_dedup if btf_ensure_modifiable() returns error. Fixes: 919d2b1dbb07 ("libbpf: Allow modification of BTF and add btf__add_str API") Signed-off-by: Mauricio Vásquez Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20211022202035.48868-1-mauricio@kinvolk.io Signed-off-by: Sasha Levin --- tools/lib/bpf/btf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 7ff3d5ce44f99..99d28f04b59d4 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -2899,8 +2899,10 @@ int btf__dedup(struct btf *btf, struct btf_ext *btf_ext, return libbpf_err(-EINVAL); } - if (btf_ensure_modifiable(btf)) - return libbpf_err(-ENOMEM); + if (btf_ensure_modifiable(btf)) { + err = -ENOMEM; + goto done; + } err = btf_dedup_prep(d); if (err) { -- 2.33.0