Revert "netfilter: avoid get_random_bytes calls" (2a50d805) · Commits · 戴 / test

net/netfilter/nfnetlink_log.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@
		#include <linux/proc_fs.h>
		#include <linux/security.h>
		#include <linux/list.h>
		#include <linux/jhash.h>
		#include <linux/random.h>
		#include <linux/slab.h>
		#include <net/sock.h>
		#include <net/netfilter/nf_log.h>
		@@ -73,6 +75,7 @@ struct nfulnl_instance {
		};

		#define INSTANCE_BUCKETS 16
		static unsigned int hash_init;

		static int nfnl_log_net_id __read_mostly;

		@@ -1063,6 +1066,11 @@ static int __init nfnetlink_log_init(void)
		{
		int status = -ENOMEM;

		/* it's not really all that important to have a random value, so
		* we can do this from the init function, even if there hasn't
		* been that much entropy yet */
		get_random_bytes(&hash_init, sizeof(hash_init));

		netlink_register_notifier(&nfulnl_rtnl_notifier);
		status = nfnetlink_subsys_register(&nfulnl_subsys);
		if (status < 0) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ static int nft_hash_init(const struct nft_set *set,
		unsigned int cnt, i;

		if (unlikely(!nft_hash_rnd_initted)) {
		nft_hash_rnd = prandom_u32();
		get_random_bytes(&nft_hash_rnd, 4);
		nft_hash_rnd_initted = true;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ static int xt_rateest_tg_checkentry(const struct xt_tgchk_param *par)
		int ret;

		if (unlikely(!rnd_inited)) {
		jhash_rnd = prandom_u32();
		get_random_bytes(&jhash_rnd, sizeof(jhash_rnd));
		rnd_inited = true;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@ static int connlimit_mt_check(const struct xt_mtchk_param *par)
		u_int32_t rand;

		do {
		rand = prandom_u32();
		get_random_bytes(&rand, sizeof(rand));
		} while (!rand);
		cmpxchg(&connlimit_rnd, 0, rand);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -177,7 +177,7 @@ dsthash_alloc_init(struct xt_hashlimit_htable *ht,
		/* initialize hash with random val at the time we allocate
		* the first hashtable entry */
		if (unlikely(!ht->rnd_initialized)) {
		ht->rnd = prandom_u32();
		get_random_bytes(&ht->rnd, sizeof(ht->rnd));
		ht->rnd_initialized = true;
		}