path: root/net
diff options
authorSamuel Gauthier <>2016-06-28 17:22:26 +0200
committerDavid S. Miller <>2016-06-29 08:13:59 -0400
commitd913d3a763a6f66a862a6eafcf6da89a7905832a (patch)
tree5c64c9ad187b5116a7b69a3a9d4e82ed620047d5 /net
parent34c7bb4705a0a2d344b0c82eaf3d3bfa2bc9da45 (diff)
openvswitch: fix conntrack netlink event delivery
Only the first and last netlink message for a particular conntrack are actually sent. The first message is sent through nf_conntrack_confirm when the conntrack is committed. The last one is sent when the conntrack is destroyed on timeout. The other conntrack state change messages are not advertised. When the conntrack subsystem is used from netfilter, nf_conntrack_confirm is called for each packet, from the postrouting hook, which in turn calls nf_ct_deliver_cached_events to send the state change netlink messages. This commit fixes the problem by calling nf_ct_deliver_cached_events in the non-commit case as well. Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action") CC: Joe Stringer <> CC: Justin Pettit <> CC: Andy Zhou <> CC: Thomas Graf <> Signed-off-by: Samuel Gauthier <> Acked-by: Joe Stringer <> Signed-off-by: David S. Miller <>
Diffstat (limited to 'net')
1 files changed, 12 insertions, 2 deletions
diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 3d5feede962d..d84312584ee4 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -818,8 +818,18 @@ static int ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
__ovs_ct_update_key(key, state, &info->zone, exp->master);
- } else
- return __ovs_ct_lookup(net, key, info, skb);
+ } else {
+ struct nf_conn *ct;
+ int err;
+ err = __ovs_ct_lookup(net, key, info, skb);
+ if (err)
+ return err;
+ ct = (struct nf_conn *)skb->nfct;
+ if (ct)
+ nf_ct_deliver_cached_events(ct);
+ }
return 0;