|
Message-ID: <CAJcbSZFS4Ddt5=QuW+J_p2V4=50VppAgVdydXEjbsTX_e+q7Sg@mail.gmail.com> Date: Tue, 9 Aug 2016 07:47:21 -0700 From: Thomas Garnier <thgarnie@...gle.com> To: Mika Penttilä <mika.penttila@...tfour.com> Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>, "H . Peter Anvin" <hpa@...or.com>, Borislav Petkov <bp@...e.de>, Joerg Roedel <jroedel@...e.de>, Dave Young <dyoung@...hat.com>, "Rafael J . Wysocki" <rafael.j.wysocki@...el.com>, Lv Zheng <lv.zheng@...el.com>, Baoquan He <bhe@...hat.com>, Dave Hansen <dave.hansen@...ux.intel.com>, Mark Salter <msalter@...hat.com>, Aleksey Makarov <aleksey.makarov@...aro.org>, Kees Cook <keescook@...omium.org>, Andrew Morton <akpm@...ux-foundation.org>, Christian Borntraeger <borntraeger@...ibm.com>, Fabian Frederick <fabf@...net.be>, Toshi Kani <toshi.kani@...com>, Dan Williams <dan.j.williams@...el.com>, "the arch/x86 maintainers" <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org>, Kernel Hardening <kernel-hardening@...ts.openwall.com> Subject: Re: [PATCH v1 2/2] x86/KASLR: Increase BRK pages for KASLR memory randomization On Mon, Aug 8, 2016 at 10:16 PM, Mika Penttilä <mika.penttila@...tfour.com> wrote: > On 08/08/2016 09:40 PM, Thomas Garnier wrote: >> Default implementation expects 6 pages maximum are needed for low page >> allocations. If KASLR memory randomization is enabled, the worse case >> of e820 layout would require 12 pages (no large pages). It is due to the >> PUD level randomization and the variable e820 memory layout. >> >> This bug was found while doing extensive testing of KASLR memory >> randomization on different type of hardware. >> >> Signed-off-by: Thomas Garnier <thgarnie@...gle.com> >> --- >> Based on next-20160805 >> --- >> arch/x86/mm/init.c | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c >> index 6209289..3a27e6a 100644 >> --- a/arch/x86/mm/init.c >> +++ b/arch/x86/mm/init.c >> @@ -130,6 +130,14 @@ void __init early_alloc_pgt_buf(void) >> unsigned long tables = INIT_PGT_BUF_SIZE; >> phys_addr_t base; >> >> + /* >> + * Depending on the machine e860 memory layout and the PUD alignement. >> + * We may need twice more pages when KASLR memoy randomization is >> + * enabled. >> + */ >> + if (IS_ENABLED(CONFIG_RANDOMIZE_MEMORY)) >> + tables *= 2; >> + >> base = __pa(extend_brk(tables, PAGE_SIZE)); >> >> pgt_buf_start = base >> PAGE_SHIFT; >> > > You should increase the reserve also : > RESERVE_BRK(early_pgt_alloc, INIT_PGT_BUF_SIZE); Yes, that's right. I will resend v2 changing INIT_PGD_BUF_SIZE. > > > --Mika >
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.