]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: conntrack: fix calculation of next bucket number in early_drop
authorVasily Khoruzhick <vasilykh@arista.com>
Thu, 25 Oct 2018 19:15:43 +0000 (12:15 -0700)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sat, 3 Nov 2018 13:16:28 +0000 (14:16 +0100)
commit2145ef01b8e62b887f12af87b6e575405cb67095
tree023e5b21bd9552c5f15764d0f8ed50e7a5c574ce
parent272a261e0e46b57549c3024b73c5a90dee0d5060
netfilter: conntrack: fix calculation of next bucket number in early_drop

If there's no entry to drop in bucket that corresponds to the hash,
early_drop() should look for it in other buckets. But since it increments
hash instead of bucket number, it actually looks in the same bucket 8
times: hsize is 16k by default (14 bits) and hash is 32-bit value, so
reciprocal_scale(hash, hsize) returns the same value for hash..hash+7 in
most cases.

Fix it by increasing bucket number instead of hash and rename _hash
to bucket to avoid future confusion.

Fixes: 2c09dc26dcd1 ("netfilter: conntrack: consider ct netns in early_drop logic")
Cc: <stable@vger.kernel.org> # v4.7+
Signed-off-by: Vasily Khoruzhick <vasilykh@arista.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_core.c