Skip to content

Commit

Permalink
random32: Restore __latent_entropy attribute on net_rand_state
Browse files Browse the repository at this point in the history
[ Upstream commit 09a6b0b ]

Commit f227e3e ("random32: update the net random state on interrupt
and activity") broke compilation and was temporarily fixed by Linus in
83bdc72 ("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: 83bdc72 ("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>
  • Loading branch information
tsautereau-anssi authored and gregkh committed Oct 7, 2020
1 parent d4ff049 commit b4b93f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/random32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit b4b93f8

Please sign in to comment.