random32: remove net_rand_state from the latent entropy gcc plugin

83bdc727 · Linus Torvalds <[email protected]> · 2020-07-29 19:11:00 -07:00

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 f227e3ec3b5c ("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 <[email protected]>
Cc: Emese Revfy <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Willy Tarreau <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 83bdc7275e6206f560d247be856bceba3e1ed8f2
Parents: d3590ebf

Changes

2 files changed · +2 −2

File	Status	Add	Del	Content
include/linux/random.h	modified	+1	−1	View file
lib/random32.c	modified	+1	−1	View file

include/linux/random.h

View file

diff --git a/include/linux/random.h b/include/linux/random.h
index 39aaa1f..f310897 100644
--- a/include/linux/random.h
+++ b/include/linux/random.h
@@ -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

View file

diff --git a/lib/random32.c b/lib/random32.c
index c4d317b..3d749ab 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -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.