From 9bf67b9272b16de75e2d825225f717133e1005d3 Mon Sep 17 00:00:00 2001 From: Jarno Rajahalme Date: Mon, 20 Jun 2016 18:51:07 -0700 Subject: [PATCH] datapath: Handle NF_REPEAT in conntrack action. Upstream commit: commit 5b6b929376a621e2bd3367f5de563d7123506597 Author: Jarno Rajahalme Date: Thu Mar 10 10:54:21 2016 -0800 openvswitch: Handle NF_REPEAT in conntrack action. Repeat the nf_conntrack_in() call when it returns NF_REPEAT. This avoids dropping a SYN packet re-opening an existing TCP connection. Signed-off-by: Jarno Rajahalme Acked-by: Joe Stringer Signed-off-by: Pablo Neira Ayuso Signed-off-by: Jarno Rajahalme Acked-by: Jesse Gross --- datapath/conntrack.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/datapath/conntrack.c b/datapath/conntrack.c index e9acc9f75..41fbab296 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -497,6 +497,7 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, */ if (!skb_nfct_cached(net, key, info, skb)) { struct nf_conn *tmpl = info->ct; + int err; /* Associate skb with specified zone. */ if (tmpl) { @@ -507,8 +508,13 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key, skb->nfctinfo = IP_CT_NEW; } - if (nf_conntrack_in(net, info->family, NF_INET_FORWARD, - skb) != NF_ACCEPT) + /* Repeat if requested, see nf_iterate(). */ + do { + err = nf_conntrack_in(net, info->family, + NF_INET_FORWARD, skb); + } while (err == NF_REPEAT); + + if (err != NF_ACCEPT) return -ENOENT; ovs_ct_update_key(skb, info, key, true); -- 2.39.5