hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: ipt_CLUSTERIP: add parameter net in clusterip_config_find_get 

Inorder to find clusterip_config in net namespace.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Gao feng 2013-09-25 15:38:47 +08:00 committed by Pablo Neira Ayuso
parent f1e8077f49
commit b5ef0f85bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/ipv4/netfilter/ipt_CLUSTERIP.c
View File

@ -122,10 +122,10 @@ clusterip_config_entry_put(struct clusterip_config *c)
} }
static struct clusterip_config * static struct clusterip_config *
__clusterip_config_find(__be32 clusterip) __clusterip_config_find(struct net *net, __be32 clusterip)
{ {
struct clusterip_config *c; struct clusterip_config *c;
struct clusterip_net *cn = net_generic(&init_net, clusterip_net_id); struct clusterip_net *cn = net_generic(net, clusterip_net_id);
list_for_each_entry_rcu(c, &cn->configs, list) { list_for_each_entry_rcu(c, &cn->configs, list) {
if (c->clusterip == clusterip) if (c->clusterip == clusterip)
@ -136,12 +136,12 @@ __clusterip_config_find(__be32 clusterip)
} }
static inline struct clusterip_config * static inline struct clusterip_config *
clusterip_config_find_get(__be32 clusterip, int entry) clusterip_config_find_get(struct net *net, __be32 clusterip, int entry)
{ {
struct clusterip_config *c; struct clusterip_config *c;
rcu_read_lock_bh(); rcu_read_lock_bh();
c = __clusterip_config_find(clusterip); c = __clusterip_config_find(net, clusterip);
if (c) { if (c) {
if (unlikely(!atomic_inc_not_zero(&c->refcount))) if (unlikely(!atomic_inc_not_zero(&c->refcount)))
c = NULL; c = NULL;
@ -381,7 +381,7 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par)
/* FIXME: further sanity checks */ /* FIXME: further sanity checks */
config = clusterip_config_find_get(e->ip.dst.s_addr, 1); config = clusterip_config_find_get(&init_net, e->ip.dst.s_addr, 1);
if (!config) { if (!config) {
if (!(cipinfo->flags & CLUSTERIP_FLAG_NEW)) { if (!(cipinfo->flags & CLUSTERIP_FLAG_NEW)) {
pr_info("no config found for %pI4, need 'new'\n", pr_info("no config found for %pI4, need 'new'\n",
@ -519,7 +519,7 @@ arp_mangle(unsigned int hook,
/* if there is no clusterip configuration for the arp reply's /* if there is no clusterip configuration for the arp reply's
* source ip, we don't want to mangle it */ * source ip, we don't want to mangle it */
c = clusterip_config_find_get(payload->src_ip, 0); c = clusterip_config_find_get(&init_net, payload->src_ip, 0);
if (!c) if (!c)
return NF_ACCEPT; return NF_ACCEPT;