From patchwork Fri Oct 2 15:16:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thibaut Sautereau X-Patchwork-Id: 11813813 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 39A95112E for ; Fri, 2 Oct 2020 15:17:36 +0000 (UTC) Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.kernel.org (Postfix) with SMTP id 04160206CD for ; Fri, 2 Oct 2020 15:17:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 04160206CD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=clip-os.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kernel-hardening-return-20086-patchwork-kernel-hardening=patchwork.kernel.org@lists.openwall.com Received: (qmail 22337 invoked by uid 550); 2 Oct 2020 15:17:32 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 22302 invoked from network); 2 Oct 2020 15:17:32 -0000 From: Thibaut Sautereau To: "David S . Miller" , Jakub Kicinski , Kees Cook Cc: netdev@vger.kernel.org, kernel-hardening@lists.openwall.com, linux-kernel@vger.kernel.org, Thibaut Sautereau , Linus Torvalds , Willy Tarreau , Emese Revfy Subject: [PATCH] random32: Restore __latent_entropy attribute on net_rand_state Date: Fri, 2 Oct 2020 17:16:11 +0200 Message-Id: <20201002151610.24258-1-thibaut.sautereau@clip-os.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 From: Thibaut Sautereau 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 Cc: Willy Tarreau Cc: Emese Revfy Signed-off-by: Thibaut Sautereau Acked-by: Kees Cook --- 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.