This is a note to let you know that I've just added the patch titled
random: only call boot_init_stack_canary() once
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
random-only-call-boot_init_stack_canary-once.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From hegtvedt@xxxxxxxxx Wed Aug 3 16:20:33 2022
From: Hans-Christian Noren Egtvedt <hegtvedt@xxxxxxxxx>
Date: Wed, 3 Aug 2022 16:01:51 +0200
Subject: random: only call boot_init_stack_canary() once
To: linux-kernel@xxxxxxxxxxxxxxx
Cc: gregkh@xxxxxxxxxxxxxxxxxxx, Hans-Christian Noren Egtvedt <hegtvedt@xxxxxxxxx>
Message-ID: <20220803140151.687558-1-hegtvedt@xxxxxxxxx>
From: Hans-Christian Noren Egtvedt <hegtvedt@xxxxxxxxx>
In commit 166a592cad36 ("random: move rand_initialize() earlier") the
boot_init_stack_canary() call was added after the new random_init()
call.
However, the upstream commit d55535232c3d ("random: move
rand_initialize() earlier") also included removing the earlier call to
boot_init_stack_canary(), making sure this call is done after
random_init().
Hence fix what I assume is a wrong merge conflict resolution on the
linux-4.9.y stable branch.
Signed-off-by: Hans-Christian Noren Egtvedt <hegtvedt@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
init/main.c | 7 -------
1 file changed, 7 deletions(-)
--- a/init/main.c
+++ b/init/main.c
@@ -500,13 +500,6 @@ asmlinkage __visible void __init start_k
page_address_init();
pr_notice("%s", linux_banner);
setup_arch(&command_line);
- /*
- * Set up the the initial canary and entropy after arch
- * and after adding latent and command line entropy.
- */
- add_latent_entropy();
- add_device_randomness(command_line, strlen(command_line));
- boot_init_stack_canary();
mm_init_cpumask(&init_mm);
setup_command_line(command_line);
setup_nr_cpu_ids();
Patches currently in stable-queue which might be from hegtvedt@xxxxxxxxx are
queue-4.9/random-only-call-boot_init_stack_canary-once.patch
queue-4.9/init-main-fix-double-the-in-comment.patch
queue-4.9/init-main.c-extract-early-boot-entropy-from-the-passed-cmdline.patch
queue-4.9/init-main-properly-align-the-multi-line-comment.patch
queue-4.9/init-move-stack-canary-initialization-after-setup_arch.patch
queue-4.9/include-uapi-linux-swab.h-fix-userspace-breakage-use-__bits_per_long-for-swap.patch
