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 01C6DC19F28 for ; Wed, 3 Aug 2022 12:07:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237742AbiHCMHJ (ORCPT ); Wed, 3 Aug 2022 08:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234250AbiHCMHG (ORCPT ); Wed, 3 Aug 2022 08:07:06 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3118C0C for ; Wed, 3 Aug 2022 05:07:05 -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 9E0D3B82253 for ; Wed, 3 Aug 2022 12:07:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E63DDC433D6; Wed, 3 Aug 2022 12:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1659528423; bh=TY8/cpj97CeuAGeyEdlSoi8KimpP3r7t3KkyLr201eM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=umW48keVamvnUxIT7cMIgzBqUOcaJvGErmpybh8Rdnt2aH0Ii3+8tqrj9v1Yt1KJn T7PzcgEVQXmnWawlGK1jkfaaWtfiyP733VNPdAN3ZzMU3IK7D1c+ieJDzxFv0vaohH RAMj8ZPvqZz8Wrs/XLCjSDZOsosg7mwU5B+4ytOI= Date: Wed, 3 Aug 2022 14:07:00 +0200 From: Greg KH To: Hans-Christian Noren Egtvedt Cc: linux-kernel@vger.kernel.org, Kees Cook , Theodore Ts'o Subject: Re: [v4.9 PATCH v2 6/6] random: move rand_initialize() earlier Message-ID: References: <20220801164328.2205839-1-hegtvedt@cisco.com> <20220801164328.2205839-6-hegtvedt@cisco.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220801164328.2205839-6-hegtvedt@cisco.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 01, 2022 at 06:43:28PM +0200, Hans-Christian Noren Egtvedt wrote: > From: Kees Cook > > Right now rand_initialize() is run as an early_initcall(), but it only > depends on timekeeping_init() (for mixing ktime_get_real() into the > pools). However, the call to boot_init_stack_canary() for stack canary > initialization runs earlier, which triggers a warning at boot: > > random: get_random_bytes called from start_kernel+0x357/0x548 with crng_init=0 > > Instead, this moves rand_initialize() to after timekeeping_init(), and moves > canary initialization here as well. > > Note that this warning may still remain for machines that do not have > UEFI RNG support (which initializes the RNG pools during setup_arch()), > or for x86 machines without RDRAND (or booting without "random.trust=on" > or CONFIG_RANDOM_TRUST_CPU=y). > > Signed-off-by: Kees Cook > Signed-off-by: Theodore Ts'o > (cherry picked from commit d55535232c3dbde9a523a9d10d68670f5fe5dec3) > Signed-off-by: Hans-Christian Noren Egtvedt > > Adjusted to fit on top of linux-4.9.y branch, suspecting a wrongly > solved conflict when cherry picked earlier. > --- > init/main.c | 7 ------- > 1 file changed, 7 deletions(-) This is not commit d55535232c3dbde9a523a9d10d68670f5fe5dec3, as that is already in the 4.9.y tree. I can see that you want to fix the previous merge up, so can you just send a real fix for that and don't try to say you really are a different commit? Other patches in this series now queued up. thanks, greg k-h