From: Ethan Jackson <ethan@nicira.com>
Date: Tue, 10 Sep 2013 20:29:30 +0000 (-0700)
Subject: ofproto: Fix core dump due to uninitialized cls_rule.
X-Git-Tag: sliver-openvswitch-2.0.90-1~15^2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c4ea31b1e05f52bb3d692d1c4f8b9dfa92189704;p=sliver-openvswitch.git

ofproto: Fix core dump due to uninitialized cls_rule.

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

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index e7ee60eeb..a9a20b811 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -1290,7 +1290,6 @@ ofproto_run(struct ofproto *p)
             struct oftable *table = &p->tables[i];
             struct eviction_group *evg;
             struct cls_cursor cursor;
-            struct cls_rule cr;
             struct rule *rule;
 
             if (!table->eviction_fields) {
@@ -1302,7 +1301,7 @@ ofproto_run(struct ofproto *p)
             }
 
             ovs_rwlock_rdlock(&table->cls.rwlock);
-            cls_cursor_init(&cursor, &table->cls, &cr);
+            cls_cursor_init(&cursor, &table->cls, NULL);
             CLS_CURSOR_FOR_EACH (rule, cr, &cursor) {
                 if (!rule->eviction_group
                     && (rule->idle_timeout || rule->hard_timeout)) {