diff options
| author | Ben Pfaff <blp@ovn.org> | 2017-07-05 15:42:49 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2017-07-05 15:43:33 -0700 |
| commit | 56247a6022ebfa5e55d251f0c43f94a4cb7b0e5b (patch) | |
| tree | f99b909bf3e26ec6e5487010d78b47204991befe /ofproto/ofproto-dpif-ipfix.c | |
| parent | 57459d0de0b66b1a4402111863bcdd9aded89b23 (diff) | |
| download | openvswitch-56247a6022ebfa5e55d251f0c43f94a4cb7b0e5b.tar.gz | |
Revert "ofproto-dpif-ipfix: Fix severe memory leak in ipfix_send_template_msgs()."
This reverts commit 4d6f69df54b7d6ec2956875c683a9564cb175662.
There is nothing wrong with the commit itself, but the commit message is
misleading. The following commit will re-apply it with a corrected commit
message.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto/ofproto-dpif-ipfix.c')
| -rw-r--r-- | ofproto/ofproto-dpif-ipfix.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 5abeba656..23fc51b7b 100644 --- a/ofproto/ofproto-dpif-ipfix.c +++ b/ofproto/ofproto-dpif-ipfix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 Nicira, Inc. + * Copyright (c) 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1281,13 +1281,13 @@ ipfix_define_template_fields(enum ipfix_proto_l2 l2, enum ipfix_proto_l3 l3, } static void -ipfix_init_template_msg(uint32_t export_time_sec, +ipfix_init_template_msg(void *msg_stub, uint32_t export_time_sec, uint32_t seq_number, uint32_t obs_domain_id, struct dp_packet *msg, size_t *set_hdr_offset) { struct ipfix_set_header *set_hdr; - dp_packet_clear(msg); + dp_packet_use_stub(msg, msg_stub, sizeof msg_stub); ipfix_init_header(export_time_sec, seq_number, obs_domain_id, msg); *set_hdr_offset = dp_packet_size(msg); @@ -1311,6 +1311,8 @@ ipfix_send_template_msg(const struct collectors *collectors, tx_errors = ipfix_send_msg(collectors, msg); + dp_packet_uninit(msg); + return tx_errors; } @@ -1320,8 +1322,6 @@ ipfix_send_template_msgs(struct dpif_ipfix_exporter *exporter, { uint64_t msg_stub[DIV_ROUND_UP(MAX_MESSAGE_LEN, 8)]; struct dp_packet msg; - dp_packet_use_stub(&msg, msg_stub, sizeof msg_stub); - size_t set_hdr_offset, tmpl_hdr_offset, error_pkts; struct ipfix_template_record_header *tmpl_hdr; uint16_t field_count; @@ -1332,7 +1332,7 @@ ipfix_send_template_msgs(struct dpif_ipfix_exporter *exporter, enum ipfix_proto_l4 l4; enum ipfix_proto_tunnel tunnel; - ipfix_init_template_msg(export_time_sec, exporter->seq_number, + ipfix_init_template_msg(msg_stub, export_time_sec, exporter->seq_number, obs_domain_id, &msg, &set_hdr_offset); /* Define one template for each possible combination of * protocols. */ @@ -1357,7 +1357,7 @@ ipfix_send_template_msgs(struct dpif_ipfix_exporter *exporter, tx_packets += collectors_count(exporter->collectors) - error_pkts; /* Reinitialize the template msg. */ - ipfix_init_template_msg(export_time_sec, + ipfix_init_template_msg(msg_stub, export_time_sec, exporter->seq_number, obs_domain_id, &msg, &set_hdr_offset); @@ -1389,7 +1389,6 @@ ipfix_send_template_msgs(struct dpif_ipfix_exporter *exporter, /* XXX: Add Options Template Sets, at least to define a Flow Keys * Option Template. */ - dp_packet_uninit(&msg); } static inline uint32_t |