ofproto-dpif: Fix merge error that caused memory leak.
authorBen Pfaff <blp@nicira.com>
Tue, 31 Jan 2012 20:54:52 +0000 (12:54 -0800)
committerBen Pfaff <blp@nicira.com>
Tue, 31 Jan 2012 20:54:52 +0000 (12:54 -0800)
Commit 5aa0fe5be (ofproto-dpif: Fix use-after-free error in
handle_miss_upcalls().), a crossport from master of commit 33bb0caa6,
did not include this necessary change, causing a memory leak.

Bug #9493.
Reported-by: Michael Hu <mhu@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
ofproto/ofproto-dpif.c

index 9fb8fcc..b6e42f8 100644 (file)
@@ -2537,7 +2537,6 @@ handle_flow_miss(struct ofproto_dpif *ofproto, struct flow_miss *miss,
         struct flow_miss_op *op;
         struct dpif_execute *execute;
 
-        list_remove(&packet->list_node);
         ofproto->n_matches++;
 
         if (facet->rule->up.cr.priority == FAIL_OPEN_PRIORITY) {