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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51A84C433DF for ; Fri, 19 Jun 2020 15:05:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 278D021D7A for ; Fri, 19 Jun 2020 15:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579127; bh=JhpQfRsModk5sQ9aL2T3NULoav7X7hkWKs2gzjta+OE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LOhNwyNhSRY2kyWhlnDtT0UUcbYMBWWVPtBTlbL0RlazC/D43H88g0oyx2M50O4CI 4UVBK3FA0Lad0O6s/2K0mBlC90u7fHVxOvrcl95K2SmRvnhPkf5CyJkTekMO0VXKKR LwEn4cLJcaj1ssmYjzSPDAEvPFX7nPMeHDT93KcI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391296AbgFSPFZ (ORCPT ); Fri, 19 Jun 2020 11:05:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:34156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391269AbgFSPFQ (ORCPT ); Fri, 19 Jun 2020 11:05:16 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ACE2221835; Fri, 19 Jun 2020 15:05:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592579116; bh=JhpQfRsModk5sQ9aL2T3NULoav7X7hkWKs2gzjta+OE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jscg9vrZ4eTE7pl+9LbcRTpCR5A6Zv3frOESdnKM/foeO6yy9rEye+w8bWXeoehNk IlwoIea1Tw/RYQp6dONac6XsU3M9PfzQLt1Ml4wGdoLY6zoT1+hCbxFaBKDVVpkRUL yM/fs6GgFl4MoSSbiyEFCb6cRC+JkkHbLR6Ygn6U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alston Tang , Andrii Nakryiko , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.4 014/261] libbpf: Fix memory leak and possible double-free in hashmap__clear Date: Fri, 19 Jun 2020 16:30:25 +0200 Message-Id: <20200619141650.554719956@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141649.878808811@linuxfoundation.org> References: <20200619141649.878808811@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrii Nakryiko [ Upstream commit 229bf8bf4d910510bc1a2fd0b89bd467cd71050d ] Fix memory leak in hashmap_clear() not freeing hashmap_entry structs for each of the remaining entries. Also NULL-out bucket list to prevent possible double-free between hashmap__clear() and hashmap__free(). Running test_progs-asan flavor clearly showed this problem. Reported-by: Alston Tang Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20200429012111.277390-5-andriin@fb.com Signed-off-by: Sasha Levin --- tools/lib/bpf/hashmap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/lib/bpf/hashmap.c b/tools/lib/bpf/hashmap.c index 6122272943e6..9ef9f6201d8b 100644 --- a/tools/lib/bpf/hashmap.c +++ b/tools/lib/bpf/hashmap.c @@ -56,7 +56,14 @@ struct hashmap *hashmap__new(hashmap_hash_fn hash_fn, void hashmap__clear(struct hashmap *map) { + struct hashmap_entry *cur, *tmp; + int bkt; + + hashmap__for_each_entry_safe(map, cur, tmp, bkt) { + free(cur); + } free(map->buckets); + map->buckets = NULL; map->cap = map->cap_bits = map->sz = 0; } -- 2.25.1