Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f0909ee authored by Joe Stringer's avatar Joe Stringer Committed by David S. Miller
Browse files

openvswitch: Mark connections new when not confirmed. 



New, related connections are marked as such as part of ovs_ct_lookup(),
but they are not marked as "new" if the commit flag is used. Make this
consistent by setting the "new" flag whenever !nf_ct_is_confirmed(ct).

Reported-by: default avatarJarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: default avatarJoe Stringer <joestringer@nicira.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d008a1d

net/openvswitch/conntrack.c

+5 −5
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ static void ovs_ct_update_key(const struct sk_buff *skb, 
	ct = nf_ct_get(skb, &ctinfo);

	if (ct) {

		state = ovs_ct_get_state(ctinfo);

		if (!nf_ct_is_confirmed(ct))

			state |= OVS_CS_F_NEW;

		if (ct->master)

			state |= OVS_CS_F_RELATED;

		zone = nf_ct_zone(ct);
@@ -377,7 +379,7 @@ static bool skb_nfct_cached(const struct net *net, const struct sk_buff *skb, 
	return true;

}



static int __ovs_ct_lookup(struct net *net, const struct sw_flow_key *key,

static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,

			   const struct ovs_conntrack_info *info,

			   struct sk_buff *skb)

{
@@ -408,6 +410,8 @@ static int __ovs_ct_lookup(struct net *net, const struct sw_flow_key *key, 
		}

	}



	ovs_ct_update_key(skb, key, true);



	return 0;

}
@@ -430,8 +434,6 @@ static int ovs_ct_lookup(struct net *net, struct sw_flow_key *key, 
		err = __ovs_ct_lookup(net, key, info, skb);

		if (err)

			return err;



		ovs_ct_update_key(skb, key, true);

	}



	return 0;
@@ -460,8 +462,6 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key, 
	if (nf_conntrack_confirm(skb) != NF_ACCEPT)

		return -EINVAL;



	ovs_ct_update_key(skb, key, true);



	return 0;

}