On Thu, Jun 06, 2019 at 06:48:44PM +0200, Alexander Potapenko wrote:
> Print the currently enabled stack and heap initialization modes.
>
> Stack initialization is enabled by a config flag, while heap
> initialization is configured at boot time with defaults being set
> in the config. It's more convenient for the user to have all information
> about these hardening measures in one place.
Perhaps for clarity, add this to the end of the sentence:
"... at boot, so the user can reason about the expected behavior of
the running system."
> The possible options for stack are:
> - "all" for CONFIG_INIT_STACK_ALL;
> - "byref_all" for CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL;
> - "byref" for CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF;
> - "__user" for CONFIG_GCC_PLUGIN_STRUCTLEAK_USER;
> - "off" otherwise.
>
> Depending on the values of init_on_alloc and init_on_free boottime
> options we also report "heap alloc" and "heap free" as "on"/"off".
>
> In the init_on_free mode initializing pages at boot time may take some
> time, so print a notice about that as well.
Perhaps give an example too:
This depends on how much memory is installed, the memory bandwidth, etc.
On a relatively modern x86 system, it takes about 0.75s/GB to wipe all
memory:
[ 0.418722] mem auto-init: stack:byref_all, heap alloc:off, heap free:on
[ 0.419765] mem auto-init: clearing system memory may take some time...
[ 12.376605] Memory: 16408564K/16776672K available (14339K kernel code, 1397K rwdata, 3756K rodata, 1636K init, 11460K bss, 368108K reserved, 0K cma-reserved)
More notes below...
>
> Signed-off-by: Alexander Potapenko <glider@xxxxxxxxxx>
> Suggested-by: Kees Cook <keescook@xxxxxxxxxxxx>
> To: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> To: Christoph Lameter <cl@xxxxxxxxx>
> Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
> Cc: James Morris <jmorris@xxxxxxxxx>
> Cc: Jann Horn <jannh@xxxxxxxxxx>
> Cc: Kostya Serebryany <kcc@xxxxxxxxxx>
> Cc: Laura Abbott <labbott@xxxxxxxxxx>
> Cc: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>
> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
> Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
> Cc: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Cc: Sandeep Patil <sspatil@xxxxxxxxxxx>
> Cc: "Serge E. Hallyn" <serge@xxxxxxxxxx>
> Cc: Souptick Joarder <jrdr.linux@xxxxxxxxx>
> Cc: Marco Elver <elver@xxxxxxxxxx>
> Cc: Kaiwan N Billimoria <kaiwan@xxxxxxxxxxxxxx>
> Cc: kernel-hardening@xxxxxxxxxxxxxxxxxx
> Cc: linux-mm@xxxxxxxxx
> Cc: linux-security-module@xxxxxxxxxxxxxxx
> ---
> v6:
> - update patch description, fixed message about clearing memory
> ---
> init/main.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/init/main.c b/init/main.c
> index 66a196c5e4c3..e68ef1f181f9 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -520,6 +520,29 @@ static inline void initcall_debug_enable(void)
> }
> #endif
>
> +/* Report memory auto-initialization states for this boot. */
> +void __init report_meminit(void)
Sorry I missed this before: it should be a static function.
> +{
> + const char *stack;
> +
> + if (IS_ENABLED(CONFIG_INIT_STACK_ALL))
> + stack = "all";
> + else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL))
> + stack = "byref_all";
> + else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF))
> + stack = "byref";
> + else if (IS_ENABLED(CONFIG_GCC_PLUGIN_STRUCTLEAK_USER))
> + stack = "__user";
> + else
> + stack = "off";
> +
> + pr_info("mem auto-init: stack:%s, heap alloc:%s, heap free:%s\n",
> + stack, want_init_on_alloc(GFP_KERNEL) ? "on" : "off",
> + want_init_on_free() ? "on" : "off");
> + if (want_init_on_free())
> + pr_info("mem auto-init: clearing system memory may take some time...\n");
> +}
> +
> /*
> * Set up kernel memory allocators
> */
> @@ -530,6 +553,7 @@ static void __init mm_init(void)
> * bigger than MAX_ORDER unless SPARSEMEM.
> */
> page_ext_init_flatmem();
> + report_meminit();
> mem_init();
> kmem_cache_init();
> pgtable_init();
> --
> 2.22.0.rc1.311.g5d7573a151-goog
>
But other than that:
Acked-by: Kees Cook <keescook@xxxxxxxxxxxx>
--
Kees Cook
