From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt0-f197.google.com (mail-qt0-f197.google.com [209.85.216.197]) by kanga.kvack.org (Postfix) with ESMTP id 08FC76B02B4 for ; Wed, 16 Aug 2017 19:15:06 -0400 (EDT) Received: by mail-qt0-f197.google.com with SMTP id 6so26033645qts.7 for ; Wed, 16 Aug 2017 16:15:06 -0700 (PDT) Received: from mail-qt0-f171.google.com (mail-qt0-f171.google.com. [209.85.216.171]) by mx.google.com with ESMTPS id i95si1642542qtb.468.2017.08.16.16.15.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 16:15:05 -0700 (PDT) Received: by mail-qt0-f171.google.com with SMTP id a18so29448180qta.0 for ; Wed, 16 Aug 2017 16:15:05 -0700 (PDT) From: Laura Abbott Subject: [PATCHv3 1/2] init: Move stack canary initialization after setup_arch Date: Wed, 16 Aug 2017 16:14:57 -0700 Message-Id: <20170816231458.2299-2-labbott@redhat.com> In-Reply-To: <20170816231458.2299-1-labbott@redhat.com> References: <20170816231458.2299-1-labbott@redhat.com> Sender: owner-linux-mm@kvack.org List-ID: To: Kees Cook Cc: Laura Abbott , kernel-hardening@lists.openwall.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Andrew Morton , Daniel Micay , Laura Abbott From: Laura Abbott Stack canary intialization involves getting a random number. Getting this random number may involve accessing caches or other architectural specific features which are not available until after the architecture is setup. Move the stack canary initialization later to accomodate this. Acked-by: Kees Cook Signed-off-by: Laura Abbott Signed-off-by: Laura Abbott --- v3: Ack from Kees --- init/main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/init/main.c b/init/main.c index 052481fbe363..21d599eaad06 100644 --- a/init/main.c +++ b/init/main.c @@ -515,12 +515,6 @@ asmlinkage __visible void __init start_kernel(void) smp_setup_processor_id(); debug_objects_early_init(); - /* - * Set up the initial canary ASAP: - */ - add_latent_entropy(); - boot_init_stack_canary(); - cgroup_init_early(); local_irq_disable(); @@ -534,6 +528,11 @@ asmlinkage __visible void __init start_kernel(void) page_address_init(); pr_notice("%s", linux_banner); setup_arch(&command_line); + /* + * Set up the the initial canary and entropy after arch + */ + add_latent_entropy(); + boot_init_stack_canary(); mm_init_cpumask(&init_mm); setup_command_line(command_line); setup_nr_cpu_ids(); -- 2.13.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org