Commit 83bdc727 authored Jul 29, 2020 by Linus Torvalds

random32: remove net_rand_state from the latent entropy gcc plugin



It turns out that the plugin right now ends up being really unhappy
about the change from 'static' to 'extern' storage that happened in
commit f227e3ec ("random32: update the net random state on interrupt
and activity").

This is probably a trivial fix for the latent_entropy plugin, but for
now, just remove net_rand_state from the list of things the plugin
worries about.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Emese Revfy <re.emese@gmail.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Willy Tarreau <w@1wt.eu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent d3590ebf

include/linux/random.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@ struct rnd_state {
		__u32 s1, s2, s3, s4;
		};

		DECLARE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
		DECLARE_PER_CPU(struct rnd_state, net_rand_state);

		u32 prandom_u32_state(struct rnd_state *state);
		void prandom_bytes_state(struct rnd_state state, void buf, size_t nbytes);

lib/random32.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ static inline void prandom_state_selftest(void)
		}
		#endif

		DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
		DEFINE_PER_CPU(struct rnd_state, net_rand_state);

		/**
		* prandom_u32_state - seeded pseudo-random number generator.

Admin message