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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CFCAC4167B for ; Mon, 30 May 2022 14:03:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239354AbiE3OBB (ORCPT ); Mon, 30 May 2022 10:01:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239363AbiE3Nv2 (ORCPT ); Mon, 30 May 2022 09:51:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E133058E54; Mon, 30 May 2022 06:36:45 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9DC30B80D84; Mon, 30 May 2022 13:36:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0AFE2C385B8; Mon, 30 May 2022 13:36:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653917803; bh=iZofyhLU1h1UGgqo+ZFG6slCtZCxHUihXneTq5aMXZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jnHOuixLFTYaHvrlMGUJOyz1mHu1gxREvfUmWnGrQg7VmtPSlecForrUNm9+2nky5 gqTFLp+L1uR3GR0N+5/Fopbp9EETVxu/UIfivJF+08IBvW8bjLVCe+mEBJkoBFJB/b LzYtDfEYIvq0twKKiB2WbV4kHCYlfnTQqrmm8QkGhODnD4qB3G9N9mrJUK1nRJ02l9 1h56kJ4FZh+8Mrn9K6jljaZiiQBenzeNFrU+gTiufvqOkl/hbT4O+o4nW7XFV1yQ7L LeyOaq0PVk+HWvopi7zK1fubaMGgrEB1BAZQP9c53qsFC8YWuyvlbT9Bi8G5Q8wyYe jDLi9xlHq4pbw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Jason A. Donenfeld" , Andrew Morton , Stafford Horne , Sasha Levin , rostedt@goodmis.org, mhiramat@kernel.org, vbabka@suse.cz, ahalaney@redhat.com, mark-pk.tsai@mediatek.com, peterz@infradead.org Subject: [PATCH AUTOSEL 5.17 103/135] init: call time_init() before rand_initialize() Date: Mon, 30 May 2022 09:31:01 -0400 Message-Id: <20220530133133.1931716-103-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530133133.1931716-1-sashal@kernel.org> References: <20220530133133.1931716-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Jason A. Donenfeld" [ Upstream commit fe222a6ca2d53c38433cba5d3be62a39099e708e ] Currently time_init() is called after rand_initialize(), but rand_initialize() makes use of the timer on various platforms, and sometimes this timer needs to be initialized by time_init() first. In order for random_get_entropy() to not return zero during early boot when it's potentially used as an entropy source, reverse the order of these two calls. The block doing random initialization was right before time_init() before, so changing the order shouldn't have any complicated effects. Cc: Andrew Morton Reviewed-by: Stafford Horne Signed-off-by: Jason A. Donenfeld Signed-off-by: Sasha Levin --- init/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/init/main.c b/init/main.c index 9a5097b2251a..b18aa5d19038 100644 --- a/init/main.c +++ b/init/main.c @@ -1035,11 +1035,13 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) softirq_init(); timekeeping_init(); kfence_init(); + time_init(); /* * For best initial stack canary entropy, prepare it after: * - setup_arch() for any UEFI RNG entropy and boot cmdline access * - timekeeping_init() for ktime entropy used in rand_initialize() + * - time_init() for making random_get_entropy() work on some platforms * - rand_initialize() to get any arch-specific entropy like RDRAND * - add_latent_entropy() to get any latent entropy * - adding command line entropy @@ -1049,7 +1051,6 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) add_device_randomness(command_line, strlen(command_line)); boot_init_stack_canary(); - time_init(); perf_event_init(); profile_init(); call_function_init(); -- 2.35.1