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

Commit 84fc57f4 authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman
Browse files

netfilter: ipt_CLUSTERIP: put config instead of freeing it 



[ Upstream commit 1a9da5937386dbe553ffcf6c65d985bd48c347c5 ]

Once struct is added to per-netns list it becomes visible to other cpus,
so we cannot use kfree().

Also delay setting entries refcount to 1 until after everything is
initialised so that when we call clusterip_config_put() in this spot
entries is still zero.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 596816fa

net/ipv4/netfilter/ipt_CLUSTERIP.c

+4 −3
Original line number Diff line number Diff line
@@ -228,7 +228,6 @@ clusterip_config_init(struct net *net, const struct ipt_clusterip_tgt_info *i, 
	c->hash_mode = i->hash_mode;

	c->hash_initval = i->hash_initval;

	refcount_set(&c->refcount, 1);

	refcount_set(&c->entries, 1);



	spin_lock_bh(&cn->lock);

	if (__clusterip_config_find(net, ip)) {
@@ -259,8 +258,10 @@ clusterip_config_init(struct net *net, const struct ipt_clusterip_tgt_info *i, 


	c->notifier.notifier_call = clusterip_netdev_event;

	err = register_netdevice_notifier(&c->notifier);

	if (!err)

	if (!err) {

		refcount_set(&c->entries, 1);

		return c;

	}



#ifdef CONFIG_PROC_FS

	proc_remove(c->pde);
@@ -269,7 +270,7 @@ clusterip_config_init(struct net *net, const struct ipt_clusterip_tgt_info *i, 
	spin_lock_bh(&cn->lock);

	list_del_rcu(&c->list);

	spin_unlock_bh(&cn->lock);

	kfree(c);

	clusterip_config_put(c);



	return ERR_PTR(err);

}