diff options
| author | Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr> | 2020-10-02 17:16:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-07 08:00:08 +0200 |
| commit | a4ebc2d6aa3ac2aa92cac8f6f53662df2c4904c9 (patch) | |
| tree | 8c824364a6d8c385f7271105821e800cc873d9bd | |
| parent | 78ba2e803f40d55e4147f12bf9b29ac1f933992f (diff) | |
| download | linux-stable-a4ebc2d6aa3ac2aa92cac8f6f53662df2c4904c9.tar.gz linux-stable-a4ebc2d6aa3ac2aa92cac8f6f53662df2c4904c9.tar.bz2 linux-stable-a4ebc2d6aa3ac2aa92cac8f6f53662df2c4904c9.zip | |
random32: Restore __latent_entropy attribute on net_rand_state
[ Upstream commit 09a6b0bc3be793ca8cba580b7992d73e9f68f15d ]
Commit f227e3ec3b5c ("random32: update the net random state on interrupt
and activity") broke compilation and was temporarily fixed by Linus in
83bdc7275e62 ("random32: remove net_rand_state from the latent entropy
gcc plugin") by entirely moving net_rand_state out of the things handled
by the latent_entropy GCC plugin.
From what I understand when reading the plugin code, using the
__latent_entropy attribute on a declaration was the wrong part and
simply keeping the __latent_entropy attribute on the variable definition
was the correct fix.
Fixes: 83bdc7275e62 ("random32: remove net_rand_state from the latent entropy gcc plugin")
Acked-by: Willy Tarreau <w@1wt.eu>
Cc: Emese Revfy <re.emese@gmail.com>
Signed-off-by: Thibaut Sautereau <thibaut.sautereau@ssi.gouv.fr>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | lib/random32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/random32.c b/lib/random32.c index 036de0c93e22..b6f3325e38e4 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); +DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy; /** * prandom_u32_state - seeded pseudo-random number generator. |