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: 1375876 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=clip-os.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C2tyx4hqtz9sSC for ; Sat, 3 Oct 2020 01:22:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388169AbgJBPWa (ORCPT ); Fri, 2 Oct 2020 11:22:30 -0400 Received: from mslow2.mail.gandi.net ([217.70.178.242]:37894 "EHLO mslow2.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726017AbgJBPWa (ORCPT ); Fri, 2 Oct 2020 11:22:30 -0400 Received: from relay10.mail.gandi.net (unknown [217.70.178.230]) by mslow2.mail.gandi.net (Postfix) with ESMTP id 4DEFD3A8EB5; Fri, 2 Oct 2020 15:17:42 +0000 (UTC) Received: from localhost.localdomain (91-166-177-199.subs.proxad.net [91.166.177.199]) (Authenticated sender: thibaut.sautereau@clip-os.org) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 6580324000F; Fri, 2 Oct 2020 15:17:17 +0000 (UTC) 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 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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.