summaryrefslogtreecommitdiff
path: root/ofproto/netflow.c
diff options
context:
space:
mode:
authorYunjian Wang <wangyunjian@huawei.com>2017-05-22 12:55:00 +0800
committerBen Pfaff <blp@ovn.org>2017-05-31 11:56:45 -0700
commitcbee493d298b5719f19eb8c2a1786d0441ebc633 (patch)
treed00955fb235f46552f38be95d7c40053b21ad63f /ofproto/netflow.c
parent964e01d1d07627e82e822eae3839a587035183bc (diff)
downloadopenvswitch-cbee493d298b5719f19eb8c2a1786d0441ebc633.tar.gz
netflow: Fix memory leak in netflow_unref.
The memory leak was triggered each time on calling netflow_unref() with containing netflow_flows. And flows need to be removed and destroyed. Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto/netflow.c')
-rw-r--r--ofproto/netflow.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index 55f781497..cd4aa7e17 100644
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -413,6 +413,14 @@ netflow_unref(struct netflow *nf)
atomic_count_dec(&netflow_count);
collectors_destroy(nf->collectors);
ofpbuf_uninit(&nf->packet);
+
+ struct netflow_flow *nf_flow, *next;
+ HMAP_FOR_EACH_SAFE (nf_flow, next, hmap_node, &nf->flows) {
+ hmap_remove(&nf->flows, &nf_flow->hmap_node);
+ free(nf_flow);
+ }
+ hmap_destroy(&nf->flows);
+
free(nf);
}
}