From patchwork Mon Oct 21 23:49:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Zhou X-Patchwork-Id: 1180935 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ovn.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46xtfV0W37z9sPd for ; Tue, 22 Oct 2019 10:49:54 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 12D9CD7A; Mon, 21 Oct 2019 23:49:16 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 655B6D56 for ; Mon, 21 Oct 2019 23:49:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D9C7C831 for ; Mon, 21 Oct 2019 23:49:14 +0000 (UTC) X-Originating-IP: 216.113.160.71 Received: from localhost.localdomain.localdomain (unknown [216.113.160.71]) (Authenticated sender: hzhou@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id E4BCC60002; Mon, 21 Oct 2019 23:49:11 +0000 (UTC) From: Han Zhou To: dev@openvswitch.org Date: Mon, 21 Oct 2019 16:49:02 -0700 Message-Id: <1571701742-49173-1-git-send-email-hzhou@ovn.org> X-Mailer: git-send-email 2.1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Han Zhou Subject: [ovs-dev] [PATCH ovn] ovn-controller.c: Fix memory leak of local_datapath->ports. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Fixes: 89f5048f960c ("ovn-controller: Minimize SB DB port_binding lookups.") Signed-off-by: Han Zhou Acked-by: Numan Siddique Acked-by: Dumitru Ceara --- controller/ovn-controller.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index b46a1d1..9ab98be 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -972,6 +972,7 @@ en_runtime_data_cleanup(struct engine_node *node) HMAP_FOR_EACH_SAFE (cur_node, next_node, hmap_node, &data->local_datapaths) { free(cur_node->peer_ports); + free(cur_node->ports); hmap_remove(&data->local_datapaths, &cur_node->hmap_node); free(cur_node); } @@ -1002,6 +1003,7 @@ en_runtime_data_run(struct engine_node *node) struct local_datapath *cur_node, *next_node; HMAP_FOR_EACH_SAFE (cur_node, next_node, hmap_node, local_datapaths) { free(cur_node->peer_ports); + free(cur_node->ports); hmap_remove(local_datapaths, &cur_node->hmap_node); free(cur_node); }