ofproto: Fix is_flow_deletion_pending() false positive.

If one tries to install a rule that's identical to another rule in another OpenFlow table which is being deleted, it's possible that is_flow_deletion_pending() might confuse them and block the installation. This is such an edge case I doubt it has ever actually happened. Found by inspection. Signed-off-by: Ethan Jackson <[email protected]> Acked-by: Ben Pfaff <[email protected]>
danieldevill · May 1, 2014 · a6fcf46 · a6fcf46
1 parent 0ef165e
commit a6fcf46
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
@@ -3953,7 +3953,8 @@ is_flow_deletion_pending(const struct ofproto *ofproto,
         HMAP_FOR_EACH_WITH_HASH (op, hmap_node,
                                  cls_rule_hash(cls_rule, table_id),
                                  &ofproto->deletions) {
-            if (cls_rule_equal(cls_rule, &op->rule->cr)) {
+            if (op->rule->table_id == table_id
+                && cls_rule_equal(cls_rule, &op->rule->cr)) {
                 return true;
             }
         }