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

Commit 7f6d6558 authored by Flavio Leitner's avatar Flavio Leitner Committed by David S. Miller
Browse files

Revert "openvswitch: Fix template leak in error cases." 



This reverts commit 90c7afc9.

When the commit was merged, the code used nf_ct_put() to free
the entry, but later on commit 76644232 ("openvswitch: Free
tmpl with tmpl_free.") replaced that with nf_ct_tmpl_free which
is a more appropriate. Now the original problem is removed.

Then 44d6e2f2 ("net: Replace NF_CT_ASSERT() with WARN_ON().")
replaced a debug assert with a WARN_ON() which is trigged now.

Signed-off-by: default avatarFlavio Leitner <fbl@redhat.com>
Acked-by: default avatarJoe Stringer <joe@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 92d7c74b

net/openvswitch/conntrack.c

+2 −4
Original line number Diff line number Diff line
@@ -1624,10 +1624,6 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr, 
		OVS_NLERR(log, "Failed to allocate conntrack template");

		return -ENOMEM;

	}



	__set_bit(IPS_CONFIRMED_BIT, &ct_info.ct->status);

	nf_conntrack_get(&ct_info.ct->ct_general);



	if (helper) {

		err = ovs_ct_add_helper(&ct_info, helper, key, log);

		if (err)
@@ -1639,6 +1635,8 @@ int ovs_ct_copy_action(struct net *net, const struct nlattr *attr, 
	if (err)

		goto err_free_ct;



	__set_bit(IPS_CONFIRMED_BIT, &ct_info.ct->status);

	nf_conntrack_get(&ct_info.ct->ct_general);

	return 0;

err_free_ct:

	__ovs_ct_free_action(&ct_info);