[ovs-dev] [patch v2 4/4] conntrack: Enforce conn_type for conn_clean().

Darrell Ball dlu998 at gmail.com
Wed Nov 21 18:12:01 UTC 2018


Add check to validate that 'conn_clean()' is only called for
conntrack entries of default 'conn_type'.

Signed-off-by: Darrell Ball <dlu998 at gmail.com>
---
 lib/conntrack.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/conntrack.c b/lib/conntrack.c
index 570b929..c188fab 100644
--- a/lib/conntrack.c
+++ b/lib/conntrack.c
@@ -803,11 +803,14 @@ nat_clean(struct conntrack *ct, struct conn *conn,
     ct_lock_lock(&ctb->lock);
 }
 
+/* Must be called with 'CT_CONN_TYPE_DEFAULT' 'conn_type'. */
 static void
 conn_clean(struct conntrack *ct, struct conn *conn,
            struct conntrack_bucket *ctb)
     OVS_REQUIRES(ctb->lock)
 {
+    ovs_assert(conn->conn_type == CT_CONN_TYPE_DEFAULT);
+
     if (conn->alg) {
         expectation_clean(ct, &conn->key, ct->hash_basis);
     }
-- 
1.9.1



More information about the dev mailing list