x86/pti: Reduce amount of kernel text allowed to be Global

commit abb67605203687c8b7943d760638d0301787f8d9

Kees reported to me that I made too much of the kernel image global.
It was far more than just text:

I think this is too much set global: _end is after data,
bss, and brk, and all kinds of other stuff that could
hold secrets. I think this should match what
mark_rodata_ro() is doing.

This does exactly that. We use __end_rodata_hpage_align as our
marker both because it is huge-page-aligned and it does not contain
any sections we expect to hold secrets.

Kees's logic was that r/o data is in the kernel image anyway and,
in the case of traditional distributions, can be freely downloaded
from the web, so there's no reason to hide it.

Fixes: 8c06c7740 (x86/pti: Leave kernel text global for !PCID)
Reported-by: Kees Cook <keescook@google.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: linux-mm@kvack.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Nadav Amit <namit@vmware.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Link: https://lkml.kernel.org/r/20180420222023.1C8B2B20@viggo.jf.intel.com


authored by Dave Hansen and committed by Thomas Gleixner a44ca8f5 58e65b51

+13 -3
+13 -3
arch/x86/mm/pti.c
··· 430 430 */ 431 431 void pti_clone_kernel_text(void) 432 432 { 433 + /* 434 + * rodata is part of the kernel image and is normally 435 + * readable on the filesystem or on the web. But, do not 436 + * clone the areas past rodata, they might contain secrets. 437 + */ 433 438 unsigned long start = PFN_ALIGN(_text); 434 - unsigned long end = ALIGN((unsigned long)_end, PMD_PAGE_SIZE); 439 + unsigned long end = (unsigned long)__end_rodata_hpage_align; 435 440 436 441 if (!pti_kernel_image_global_ok()) 437 442 return; 438 443 444 + pr_debug("mapping partial kernel image into user address space\n"); 445 + 446 + /* 447 + * Note that this will undo _some_ of the work that 448 + * pti_set_kernel_image_nonglobal() did to clear the 449 + * global bit. 450 + */ 439 451 pti_clone_pmds(start, end, _PAGE_RW); 440 452 } 441 453 ··· 469 457 470 458 if (pti_kernel_image_global_ok()) 471 459 return; 472 - 473 - pr_debug("set kernel image non-global\n"); 474 460 475 461 set_memory_nonglobal(start, (end - start) >> PAGE_SHIFT); 476 462 }