From patchwork Mon Oct 5 15:26:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 268189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79217C4727F for ; Mon, 5 Oct 2020 15:28:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 295482074F for ; Mon, 5 Oct 2020 15:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911680; bh=uiNqTYDURgLGySXhEc28Mgra9vdGHTQiyoSaglBcKxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FvN0FYJzT3veF9BY/fSeYoLbH8zRiMItPvTymHLL7OSNtcF4YLrWA3WIUgH0t6BYl +hPYyUwZJdO0rLXr7zyhq9w0lQhAwQQKXqgdzRcF0dJP6vy/8yf0RPn1Y9puyjfYVY LphE8uTt2G/xzvbKKoMlRYftY47+6nDtxY5/U9qA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727314AbgJEP17 (ORCPT ); Mon, 5 Oct 2020 11:27:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:52504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727227AbgJEP1s (ORCPT ); Mon, 5 Oct 2020 11:27:48 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9DB25207BC; Mon, 5 Oct 2020 15:27:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601911667; bh=uiNqTYDURgLGySXhEc28Mgra9vdGHTQiyoSaglBcKxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RUYkNKy2aUbxRuVHqK1Gcv97WTv7ieo1cbiNFvwHXHSD4QC7bHd+xxG96ejYMR0cs b6evMK/24CoAU5xq7TYH6oBNhQPbvtH1/1Uji72BsXSDgs29vUK134E2DNekudv0PS tyvHVds2DJaU5z4LsjQj7osP/zZ6z9f7C0SyON5Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Willy Tarreau , Emese Revfy , Thibaut Sautereau , Linus Torvalds , Sasha Levin Subject: [PATCH 4.19 30/38] random32: Restore __latent_entropy attribute on net_rand_state Date: Mon, 5 Oct 2020 17:26:47 +0200 Message-Id: <20201005142110.124077096@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201005142108.650363140@linuxfoundation.org> References: <20201005142108.650363140@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Thibaut Sautereau [ 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 Cc: Emese Revfy Signed-off-by: Thibaut Sautereau Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- lib/random32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/random32.c b/lib/random32.c index 036de0c93e224..b6f3325e38e43 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.