ofproto-dpif-xlate: Fix bug that may leak ofproto_flow_mod

yifsun · blp · commit 1bddcb5dc598 · 2017-11-29T16:43:51.000-08:00
When ofm is not referenced by xc_entry, we should release its
resources by calling ofproto_flow_mod_uninit because no one is
going to use it in this function.

Signed-off-by: Yifeng Sun &lt;pkusunyifeng@gmail.com&gt;
Signed-off-by: Ben Pfaff &lt;blp@ovn.org&gt;
diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
@@ -5123,6 +5123,8 @@ xlate_learn_action(struct xlate_ctx *ctx, const struct ofpact_learn *learn)
                 entry->learn.ofm = ofm;
                 entry->learn.limit = learn->limit;
                 ofm = NULL;
+            } else {
+                ofproto_flow_mod_uninit(ofm);
             }
 
             if (OVS_UNLIKELY(ctx->xin->trace && !success)) {

Original file line number	Diff line number	Diff line change
`@@ -5123,6 +5123,8 @@ xlate_learn_action(struct xlate_ctx ctx, const struct ofpact_learn learn)`
`5123`	`5123`	`entry->learn.ofm = ofm;`
`5124`	`5124`	`entry->learn.limit = learn->limit;`
`5125`	`5125`	`ofm = NULL;`
	`5126`	`+ } else {`
	`5127`	`+ ofproto_flow_mod_uninit(ofm);`
`5126`	`5128`	`}`
`5127`	`5129`
`5128`	`5130`	`if (OVS_UNLIKELY(ctx->xin->trace && !success)) {`