diff options
| author | Darrell Ball <dlu998@gmail.com> | 2018-12-17 14:43:14 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-12-18 14:13:13 -0800 |
| commit | 9e8f3960d8559c62c457af5cd0ef649b75551b4c (patch) | |
| tree | 3b1a99e1776528fa89030d7562e27b7a017587da /lib | |
| parent | a1d5eeff7c5375925f549426d8a36b02f575da2c (diff) | |
| download | openvswitch-9e8f3960d8559c62c457af5cd0ef649b75551b4c.tar.gz | |
conntrack: Enforce conn_type for conn_clean().
Add check to validate that 'conn_clean()' is only called for
conntrack entries of default 'conn_type'.
Signed-off-by: Darrell Ball <dlu998@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/conntrack.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/conntrack.c b/lib/conntrack.c index 41232f407..7b5a3f0a2 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); } |