* Andy Lutomirski <[email protected]> wrote:
> The cpu_entry_area will contain stacks. Make sure that KASAN has
> appropriate shadow mappings for them.
>
> Cc: Andrey Ryabinin <[email protected]>
> Cc: Alexander Potapenko <[email protected]>
> Cc: Dmitry Vyukov <[email protected]>
> Cc: [email protected]
> Signed-off-by: Andy Lutomirski <[email protected]>
> ---
> arch/x86/mm/kasan_init_64.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
> index 99dfed6dfef8..43d376687315 100644
> --- a/arch/x86/mm/kasan_init_64.c
> +++ b/arch/x86/mm/kasan_init_64.c
> @@ -330,7 +330,14 @@ void __init kasan_init(void)
> early_pfn_to_nid(__pa(_stext)));
>
> kasan_populate_zero_shadow(kasan_mem_to_shadow((void *)MODULES_END),
> - (void *)KASAN_SHADOW_END);
> + kasan_mem_to_shadow((void
> *)(__fix_to_virt(FIX_CPU_ENTRY_AREA_BOTTOM))));
> +
> + kasan_populate_shadow((unsigned long)kasan_mem_to_shadow((void
> *)(__fix_to_virt(FIX_CPU_ENTRY_AREA_BOTTOM))),
> + (unsigned long)kasan_mem_to_shadow((void
> *)(__fix_to_virt(FIX_CPU_ENTRY_AREA_TOP) + PAGE_SIZE)),
> + 0);
> +
> + kasan_populate_zero_shadow(kasan_mem_to_shadow((void
> *)(__fix_to_virt(FIX_CPU_ENTRY_AREA_TOP) + PAGE_SIZE)),
> + (void *)KASAN_SHADOW_END);
Note, this commit has a dependency on:
d17a1d97dc20: x86/mm/kasan: don't use vmemmap_populate() to initialize shadow
which got merged upstream outside the x86 tree, so it has a whole bunch of
merge
window dependencies.
To make testing+backporting to v4.14 easier I've cherry-picked d17a1d97dc20
into
x86/urgent.
( I've Cc:-ed Linus, just in case this kind of preemptive cherry-picking is
frowned upon. )
Thanks,
Ingo
