Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4656c4d61adb8dc3ee04c08f57a5cc7598814420

Authored by Changli Gao
Committed by Patrick McHardy
1 parent 3e0d5149e6
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff

net/netfilter/xt_connlimit.c
Diff comments   View file @ 4656c4d
... ... @@ -44,7 +44,6 @@
44 44 };
45 45  
46 46 static u_int32_t connlimit_rnd __read_mostly;
47   -static bool connlimit_rnd_inited __read_mostly;
48 47  
49 48 static inline unsigned int connlimit_iphash(__be32 addr)
50 49 {
... ... @@ -226,9 +225,13 @@
226 225 unsigned int i;
227 226 int ret;
228 227  
229   - if (unlikely(!connlimit_rnd_inited)) {
230   - get_random_bytes(&connlimit_rnd, sizeof(connlimit_rnd));
231   - connlimit_rnd_inited = true;
  228 + if (unlikely(!connlimit_rnd)) {
  229 + u_int32_t rand;
  230 +
  231 + do {
  232 + get_random_bytes(&rand, sizeof(rand));
  233 + } while (!rand);
  234 + cmpxchg(&connlimit_rnd, 0, rand);
232 235 }
233 236 ret = nf_ct_l3proto_try_module_get(par->family);
234 237 if (ret < 0) {