openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: nat: fix cmp return value 

The comparator works like memcmp, i.e. 0 means objects are equal.
In other words, when objects are distinct they are treated as identical,
when they are distinct they are allegedly the same.

The first case is rare (distinct objects are unlikely to get hashed to
same bucket).

The second case results in unneeded port conflict resolutions attempts.

Fixes: 870190a9ec ("netfilter: nat: convert nat bysrc hash to rhashtable")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2016-11-16 15:13:35 +01:00 committed by Pablo Neira Ayuso
parent abd66e9f3c
commit 728e87b496
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/netfilter/nf_nat_core.c
View File

@ -193,9 +193,12 @@ static int nf_nat_bysource_cmp(struct rhashtable_compare_arg *arg,
const struct nf_nat_conn_key *key = arg->key; const struct nf_nat_conn_key *key = arg->key;
const struct nf_conn *ct = obj; const struct nf_conn *ct = obj;
return same_src(ct, key->tuple) && if (!same_src(ct, key->tuple) ||
net_eq(nf_ct_net(ct), key->net) && !net_eq(nf_ct_net(ct), key->net) ||
nf_ct_zone_equal(ct, key->zone, IP_CT_DIR_ORIGINAL); !nf_ct_zone_equal(ct, key->zone, IP_CT_DIR_ORIGINAL))
return 1;
return 0;
} }
static struct rhashtable_params nf_nat_bysource_params = { static struct rhashtable_params nf_nat_bysource_params = {