From mboxrd@z Thu Jan 1 00:00:00 1970 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=-12.7 required=3.0 tests=BAYES_00, 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 D629FC55ABD for ; Fri, 13 Nov 2020 16:19:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A09EB2076B for ; Fri, 13 Nov 2020 16:19:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726325AbgKMQTW (ORCPT ); Fri, 13 Nov 2020 11:19:22 -0500 Received: from foss.arm.com ([217.140.110.172]:40996 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725866AbgKMQTW (ORCPT ); Fri, 13 Nov 2020 11:19:22 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 097BF1042; Fri, 13 Nov 2020 08:19:22 -0800 (PST) Received: from donnerap.arm.com (donnerap.cambridge.arm.com [10.1.195.35]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DF1363F718; Fri, 13 Nov 2020 08:19:20 -0800 (PST) From: Andre Przywara To: Theodore Ts'o Cc: Mark Rutland , Will Deacon , Catalin Marinas , Mark Brown , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] random: Use arch_get_random_long_early() for init_std_data() Date: Fri, 13 Nov 2020 16:19:12 +0000 Message-Id: <20201113161912.62068-1-andre.przywara@arm.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit 253d3194c2b5 ("random: add arch_get_random_*long_early()") we introduced _early versions of arch_get_random_long(), that are used on arm64 to use the CPU RNDR instruction early in the boot process, before we have established system-wide availability. This covers the calls in crng_initialize_primary(), but missed the calls in init_std_data(), happening just before that. Use the _early versions of the arch_get_random* calls also in init_std_data(), to help initialising the pool with proper seed values. Fixes: 253d3194c2b5 ("random: add arch_get_random_*long_early()") Cc: Mark Rutland Signed-off-by: Andre Przywara --- drivers/char/random.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 2a41b21623ae..43bb331a67bd 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1778,8 +1778,8 @@ static void __init init_std_data(struct entropy_store *r) mix_pool_bytes(r, &now, sizeof(now)); for (i = r->poolinfo->poolbytes; i > 0; i -= sizeof(rv)) { - if (!arch_get_random_seed_long(&rv) && - !arch_get_random_long(&rv)) + if (!arch_get_random_seed_long_early(&rv) && + !arch_get_random_long_early(&rv)) rv = random_get_entropy(); mix_pool_bytes(r, &rv, sizeof(rv)); } -- 2.17.1