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 <ja...@ovn.org>
Acked-by: Joe Stringer <j...@ovn.org>
---
 net/openvswitch/conntrack.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index b838536..92613de 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -485,6 +485,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) {
@@ -495,8 +496,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_PRE_ROUTING,
-                                   skb) != NF_ACCEPT)
+               /* Repeat if requested, see nf_iterate(). */
+               do {
+                       err = nf_conntrack_in(net, info->family,
+                                             NF_INET_PRE_ROUTING, skb);
+               } while (err == NF_REPEAT);
+
+               if (err != NF_ACCEPT)
                        return -ENOENT;
 
                ovs_ct_update_key(skb, info, key, true);
-- 
2.1.4

Reply via email to