From: Ben Pfaff <blp@nicira.com>
Date: Fri, 16 Aug 2013 00:54:04 +0000 (-0700)
Subject: ofproto-dpif: Fix bad pointer dereference when deleting a bridge.
X-Git-Tag: sliver-openvswitch-2.0.90-1~24^2~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=24623c9175d3c1373cf70a0cb95d11b3c655a2e3;p=sliver-openvswitch.git

ofproto-dpif: Fix bad pointer dereference when deleting a bridge.

The 'pins' list contains packet-ins, not flow-mods.

Introduced by commit ada3a58d1f8 (ofproto-dpif: Make packet_ins thread
safe.).

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 4e953f413..0b7df80a6 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1418,7 +1418,7 @@ destruct(struct ofproto *ofproto_)
 {
     struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_);
     struct rule_dpif *rule, *next_rule;
-    struct ofputil_flow_mod *pin, *next_pin;
+    struct ofputil_packet_in *pin, *next_pin;
     struct ofputil_flow_mod *fm, *next_fm;
     struct oftable *table;
 
@@ -1455,7 +1455,7 @@ destruct(struct ofproto *ofproto_)
     LIST_FOR_EACH_SAFE (pin, next_pin, list_node, &ofproto->pins) {
         list_remove(&pin->list_node);
         ofproto->n_pins--;
-        free(pin->ofpacts);
+        free(CONST_CAST(void *, pin->packet));
         free(pin);
     }
     ovs_mutex_unlock(&ofproto->pin_mutex);