[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Fri, 2 Oct 2020 17:16:11 +0200
From: Thibaut Sautereau <thibaut.sautereau@...p-os.org>
To: "David S . Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Kees Cook <keescook@...omium.org>
Cc: netdev@...r.kernel.org,
kernel-hardening@...ts.openwall.com,
linux-kernel@...r.kernel.org,
Thibaut Sautereau <thibaut.sautereau@....gouv.fr>,
Linus Torvalds <torvalds@...ux-foundation.org>,
Willy Tarreau <w@....eu>,
Emese Revfy <re.emese@...il.com>
Subject: [PATCH] random32: Restore __latent_entropy attribute on net_rand_state
From: Thibaut Sautereau <thibaut.sautereau@....gouv.fr>
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")
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Willy Tarreau <w@....eu>
Cc: Emese Revfy <re.emese@...il.com>
Signed-off-by: Thibaut Sautereau <thibaut.sautereau@....gouv.fr>
---
lib/random32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/random32.c b/lib/random32.c
index 932345323af0..dfb9981ab798 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -49,7 +49,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.
--
2.28.0
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
