netfilter: xt_connlimit: remove connlimit_rnd_inited
A potential race condition when generating connlimit_rnd is also fixed. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
parent
3e0d5149e6
commit
4656c4d61a
|
@ -44,7 +44,6 @@ struct xt_connlimit_data {
|
||||||
};
|
};
|
||||||
|
|
||||||
static u_int32_t connlimit_rnd __read_mostly;
|
static u_int32_t connlimit_rnd __read_mostly;
|
||||||
static bool connlimit_rnd_inited __read_mostly;
|
|
||||||
|
|
||||||
static inline unsigned int connlimit_iphash(__be32 addr)
|
static inline unsigned int connlimit_iphash(__be32 addr)
|
||||||
{
|
{
|
||||||
|
@ -226,9 +225,13 @@ static int connlimit_mt_check(const struct xt_mtchk_param *par)
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (unlikely(!connlimit_rnd_inited)) {
|
if (unlikely(!connlimit_rnd)) {
|
||||||
get_random_bytes(&connlimit_rnd, sizeof(connlimit_rnd));
|
u_int32_t rand;
|
||||||
connlimit_rnd_inited = true;
|
|
||||||
|
do {
|
||||||
|
get_random_bytes(&rand, sizeof(rand));
|
||||||
|
} while (!rand);
|
||||||
|
cmpxchg(&connlimit_rnd, 0, rand);
|
||||||
}
|
}
|
||||||
ret = nf_ct_l3proto_try_module_get(par->family);
|
ret = nf_ct_l3proto_try_module_get(par->family);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
|
Loading…
Reference in a new issue