From a6fcf462476db3385027d3bfcc1d2dc8386e6f2a Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Wed, 30 Apr 2014 17:24:21 -0700 Subject: [PATCH] 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 Acked-by: Ben Pfaff --- ofproto/ofproto.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 208efc1e8..eb1f3be8a 100644 --- 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; } } -- 2.43.0