Commit e6b7c5f7 authored by Linus Torvalds's avatar Linus Torvalds Committed by Greg Kroah-Hartman

random32: remove net_rand_state from the latent entropy gcc plugin

commit 83bdc727 upstream.

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: default avatarStephen 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f697da3
...@@ -116,7 +116,7 @@ struct rnd_state { ...@@ -116,7 +116,7 @@ struct rnd_state {
__u32 s1, s2, s3, s4; __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); u32 prandom_u32_state(struct rnd_state *state);
void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes); void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
......
...@@ -48,7 +48,7 @@ static inline void prandom_state_selftest(void) ...@@ -48,7 +48,7 @@ static inline void prandom_state_selftest(void)
} }
#endif #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. * prandom_u32_state - seeded pseudo-random number generator.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment