From: Andy Lutomirski <luto@kernel.org> To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, x86@kernel.org, Borislav Petkov <bp@alien8.de> Cc: Nadav Amit <nadav.amit@gmail.com>, Kees Cook <keescook@chromium.org>, Brian Gerst <brgerst@gmail.com>, "kernel-hardening@lists.openwall.com" <kernel-hardening@lists.openwall.com>, Linus Torvalds <torvalds@linux-foundation.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Andy Lutomirski <luto@kernel.org> Subject: [PATCH 06/13] fork: Add generic vmalloced stack support Date: Wed, 15 Jun 2016 17:28:28 -0700 [thread overview] Message-ID: <fdee1749f758de33fed9ab8227b6afaa56388b63.1466036668.git.luto@kernel.org> (raw) In-Reply-To: <cover.1466036668.git.luto@kernel.org> In-Reply-To: <cover.1466036668.git.luto@kernel.org> If CONFIG_VMAP_STACK is selected, kernel stacks are allocated with vmalloc_node. Signed-off-by: Andy Lutomirski <luto@kernel.org> --- arch/Kconfig | 12 ++++++++++++ kernel/fork.c | 45 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index d794384a0404..1acd262036b0 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -658,4 +658,16 @@ config ARCH_NO_COHERENT_DMA_MMAP config CPU_NO_EFFICIENT_FFS def_bool n +config HAVE_ARCH_VMAP_STACK + def_bool n + +config VMAP_STACK + bool "Use a virtually-mapped stack" + depends on HAVE_ARCH_VMAP_STACK + ---help--- + Enable this if you want the use virtually-mapped kernel stacks + with guard pages. This causes kernel stack overflows to be + caught immediately rather than causing difficult-to-diagnose + corruption. + source "kernel/gcov/Kconfig" diff --git a/kernel/fork.c b/kernel/fork.c index 59e52f2120a3..37234fa0ba9b 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -158,19 +158,30 @@ void __weak arch_release_thread_info(struct thread_info *ti) * Allocate pages if THREAD_SIZE is >= PAGE_SIZE, otherwise use a * kmemcache based allocator. */ -# if THREAD_SIZE >= PAGE_SIZE +# if THREAD_SIZE >= PAGE_SIZE || defined(CONFIG_VMAP_STACK) static struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node) { +#ifdef CONFIG_VMAP_STACK + return __vmalloc_node_range( + THREAD_SIZE, THREAD_SIZE, VMALLOC_START, VMALLOC_END, + GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, + 0, node, __builtin_return_address(0)); +#else struct page *page = alloc_kmem_pages_node(node, THREADINFO_GFP, THREAD_SIZE_ORDER); return page ? page_address(page) : NULL; +#endif } static inline void free_thread_info(struct thread_info *ti) { +#ifdef CONFIG_VMAP_STACK + vfree(ti); +#else free_kmem_pages((unsigned long)ti, THREAD_SIZE_ORDER); +#endif } # else static struct kmem_cache *thread_info_cache; @@ -215,15 +226,33 @@ static struct kmem_cache *mm_cachep; static void account_kernel_stack(struct thread_info *ti, int account) { - struct zone *zone = page_zone(virt_to_page(ti)); + struct zone *zone; + + if (IS_ENABLED(CONFIG_VMAP_STACK) && !virt_addr_valid(ti)) { + int i; + struct vm_struct *vm = find_vm_area(ti); - mod_zone_page_state(zone, NR_KERNEL_STACK, - THREAD_SIZE / PAGE_SIZE * account); + WARN_ON_ONCE(vm->nr_pages != THREAD_SIZE / PAGE_SIZE); - /* All stack pages belong to the same memcg. */ - memcg_kmem_update_page_stat( - virt_to_page(ti), MEMCG_KERNEL_STACK, - account * (THREAD_SIZE / PAGE_SIZE)); + for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++) { + mod_zone_page_state(page_zone(vm->pages[i]), + 1, account); + } + + /* All stack pages belong to the same memcg. */ + memcg_kmem_update_page_stat( + vm->pages[0], MEMCG_KERNEL_STACK, + account * (THREAD_SIZE / PAGE_SIZE)); + } else { + zone = page_zone(virt_to_page(ti)); + mod_zone_page_state(zone, NR_KERNEL_STACK, + THREAD_SIZE / PAGE_SIZE * account); + + /* All stack pages belong to the same memcg. */ + memcg_kmem_update_page_stat( + virt_to_page(ti), MEMCG_KERNEL_STACK, + account * (THREAD_SIZE / PAGE_SIZE)); + } } void free_task(struct task_struct *tsk) -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Andy Lutomirski <luto@kernel.org> To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, x86@kernel.org, Borislav Petkov <bp@alien8.de> Cc: Nadav Amit <nadav.amit@gmail.com>, Kees Cook <keescook@chromium.org>, Brian Gerst <brgerst@gmail.com>, "kernel-hardening@lists.openwall.com" <kernel-hardening@lists.openwall.com>, Linus Torvalds <torvalds@linux-foundation.org>, Josh Poimboeuf <jpoimboe@redhat.com>, Andy Lutomirski <luto@kernel.org> Subject: [kernel-hardening] [PATCH 06/13] fork: Add generic vmalloced stack support Date: Wed, 15 Jun 2016 17:28:28 -0700 [thread overview] Message-ID: <fdee1749f758de33fed9ab8227b6afaa56388b63.1466036668.git.luto@kernel.org> (raw) In-Reply-To: <cover.1466036668.git.luto@kernel.org> In-Reply-To: <cover.1466036668.git.luto@kernel.org> If CONFIG_VMAP_STACK is selected, kernel stacks are allocated with vmalloc_node. Signed-off-by: Andy Lutomirski <luto@kernel.org> --- arch/Kconfig | 12 ++++++++++++ kernel/fork.c | 45 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index d794384a0404..1acd262036b0 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -658,4 +658,16 @@ config ARCH_NO_COHERENT_DMA_MMAP config CPU_NO_EFFICIENT_FFS def_bool n +config HAVE_ARCH_VMAP_STACK + def_bool n + +config VMAP_STACK + bool "Use a virtually-mapped stack" + depends on HAVE_ARCH_VMAP_STACK + ---help--- + Enable this if you want the use virtually-mapped kernel stacks + with guard pages. This causes kernel stack overflows to be + caught immediately rather than causing difficult-to-diagnose + corruption. + source "kernel/gcov/Kconfig" diff --git a/kernel/fork.c b/kernel/fork.c index 59e52f2120a3..37234fa0ba9b 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -158,19 +158,30 @@ void __weak arch_release_thread_info(struct thread_info *ti) * Allocate pages if THREAD_SIZE is >= PAGE_SIZE, otherwise use a * kmemcache based allocator. */ -# if THREAD_SIZE >= PAGE_SIZE +# if THREAD_SIZE >= PAGE_SIZE || defined(CONFIG_VMAP_STACK) static struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node) { +#ifdef CONFIG_VMAP_STACK + return __vmalloc_node_range( + THREAD_SIZE, THREAD_SIZE, VMALLOC_START, VMALLOC_END, + GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, + 0, node, __builtin_return_address(0)); +#else struct page *page = alloc_kmem_pages_node(node, THREADINFO_GFP, THREAD_SIZE_ORDER); return page ? page_address(page) : NULL; +#endif } static inline void free_thread_info(struct thread_info *ti) { +#ifdef CONFIG_VMAP_STACK + vfree(ti); +#else free_kmem_pages((unsigned long)ti, THREAD_SIZE_ORDER); +#endif } # else static struct kmem_cache *thread_info_cache; @@ -215,15 +226,33 @@ static struct kmem_cache *mm_cachep; static void account_kernel_stack(struct thread_info *ti, int account) { - struct zone *zone = page_zone(virt_to_page(ti)); + struct zone *zone; + + if (IS_ENABLED(CONFIG_VMAP_STACK) && !virt_addr_valid(ti)) { + int i; + struct vm_struct *vm = find_vm_area(ti); - mod_zone_page_state(zone, NR_KERNEL_STACK, - THREAD_SIZE / PAGE_SIZE * account); + WARN_ON_ONCE(vm->nr_pages != THREAD_SIZE / PAGE_SIZE); - /* All stack pages belong to the same memcg. */ - memcg_kmem_update_page_stat( - virt_to_page(ti), MEMCG_KERNEL_STACK, - account * (THREAD_SIZE / PAGE_SIZE)); + for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++) { + mod_zone_page_state(page_zone(vm->pages[i]), + 1, account); + } + + /* All stack pages belong to the same memcg. */ + memcg_kmem_update_page_stat( + vm->pages[0], MEMCG_KERNEL_STACK, + account * (THREAD_SIZE / PAGE_SIZE)); + } else { + zone = page_zone(virt_to_page(ti)); + mod_zone_page_state(zone, NR_KERNEL_STACK, + THREAD_SIZE / PAGE_SIZE * account); + + /* All stack pages belong to the same memcg. */ + memcg_kmem_update_page_stat( + virt_to_page(ti), MEMCG_KERNEL_STACK, + account * (THREAD_SIZE / PAGE_SIZE)); + } } void free_task(struct task_struct *tsk) -- 2.7.4
next prev parent reply other threads:[~2016-06-16 0:31 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-16 0:28 [PATCH 00/13] Virtually mapped stacks with guard pages (x86, core) Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` [PATCH 01/13] x86/mm/hotplug: Don't remove PGD entries in remove_pagetable() Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` Andy Lutomirski 2016-06-16 0:28 ` [PATCH 02/13] x86/cpa: In populate_pgd, don't set the pgd entry until it's populated Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` [PATCH 03/13] x86/cpa: Warn if kernel_unmap_pages_in_pgd is used inappropriately Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` [PATCH 04/13] mm: Track NR_KERNEL_STACK in pages instead of number of stacks Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` Andy Lutomirski 2016-06-16 11:10 ` Vladimir Davydov 2016-06-16 11:10 ` [kernel-hardening] " Vladimir Davydov 2016-06-16 11:10 ` Vladimir Davydov 2016-06-16 17:21 ` Andy Lutomirski 2016-06-16 17:21 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 17:21 ` Andy Lutomirski 2016-06-16 19:20 ` Andy Lutomirski 2016-06-16 19:20 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 19:20 ` Andy Lutomirski 2016-06-16 15:33 ` Josh Poimboeuf 2016-06-16 15:33 ` [kernel-hardening] " Josh Poimboeuf 2016-06-16 15:33 ` Josh Poimboeuf 2016-06-16 17:39 ` Andy Lutomirski 2016-06-16 17:39 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 17:39 ` Andy Lutomirski 2016-06-16 19:39 ` Josh Poimboeuf 2016-06-16 19:39 ` [kernel-hardening] " Josh Poimboeuf 2016-06-16 19:39 ` Josh Poimboeuf 2016-06-16 0:28 ` [PATCH 05/13] mm: Move memcg stack accounting to account_kernel_stack Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` Andy Lutomirski 2016-06-16 0:28 ` Andy Lutomirski [this message] 2016-06-16 0:28 ` [kernel-hardening] [PATCH 06/13] fork: Add generic vmalloced stack support Andy Lutomirski 2016-06-16 17:25 ` Kees Cook 2016-06-16 17:25 ` [kernel-hardening] " Kees Cook 2016-06-16 17:37 ` Andy Lutomirski 2016-06-16 17:37 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` [PATCH 07/13] x86/die: Don't try to recover from an OOPS on a non-default stack Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` [PATCH 08/13] x86/dumpstack: When OOPSing, rewind the stack before do_exit Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 17:50 ` Josh Poimboeuf 2016-06-16 17:50 ` [kernel-hardening] " Josh Poimboeuf 2016-06-16 17:57 ` Andy Lutomirski 2016-06-16 17:57 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` [PATCH 09/13] x86/dumpstack: When dumping stack bytes due to OOPS, start with regs->sp Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 11:56 ` Borislav Petkov 2016-06-16 11:56 ` [kernel-hardening] " Borislav Petkov 2016-07-08 12:07 ` [tip:x86/debug] x86/dumpstack: Honor supplied @regs arg tip-bot for Andy Lutomirski 2016-06-16 0:28 ` [PATCH 10/13] x86/dumpstack: Try harder to get a call trace on stack overflow Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 18:16 ` Josh Poimboeuf 2016-06-16 18:16 ` [kernel-hardening] " Josh Poimboeuf 2016-06-16 18:22 ` Andy Lutomirski 2016-06-16 18:22 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 18:33 ` Josh Poimboeuf 2016-06-16 18:33 ` [kernel-hardening] " Josh Poimboeuf 2016-06-16 18:37 ` Andy Lutomirski 2016-06-16 18:37 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 18:54 ` Josh Poimboeuf 2016-06-16 18:54 ` [kernel-hardening] " Josh Poimboeuf 2016-06-16 0:28 ` [PATCH 11/13] x86/dumpstack/64: Handle faults when printing the "Stack:" part of an OOPS Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 0:28 ` [PATCH 12/13] x86/mm/64: Enable vmapped stacks Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 4:17 ` Mika Penttilä 2016-06-16 4:17 ` [kernel-hardening] " Mika Penttilä 2016-06-16 5:33 ` Andy Lutomirski 2016-06-16 5:33 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 13:11 ` Rik van Riel 2016-06-16 0:28 ` [PATCH 13/13] x86/mm: Improve stack-overflow #PF handling Andy Lutomirski 2016-06-16 0:28 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 6:05 ` [PATCH 00/13] Virtually mapped stacks with guard pages (x86, core) Heiko Carstens 2016-06-16 6:05 ` [kernel-hardening] " Heiko Carstens 2016-06-16 17:50 ` Andy Lutomirski 2016-06-16 17:50 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 18:14 ` Andy Lutomirski 2016-06-16 18:14 ` [kernel-hardening] " Andy Lutomirski 2016-06-16 21:27 ` Andy Lutomirski 2016-06-16 21:27 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 3:58 ` Andy Lutomirski 2016-06-17 3:58 ` [kernel-hardening] " Andy Lutomirski 2016-06-17 7:27 ` Heiko Carstens 2016-06-17 7:27 ` [kernel-hardening] " Heiko Carstens 2016-06-17 17:38 ` Andy Lutomirski 2016-06-17 17:38 ` [kernel-hardening] " Andy Lutomirski 2016-06-20 5:58 ` Heiko Carstens 2016-06-20 5:58 ` [kernel-hardening] " Heiko Carstens 2016-06-20 6:01 ` Andy Lutomirski 2016-06-20 6:01 ` [kernel-hardening] " Andy Lutomirski 2016-06-20 7:07 ` Heiko Carstens 2016-06-20 7:07 ` [kernel-hardening] " Heiko Carstens 2016-06-16 17:24 ` Kees Cook 2016-06-16 17:24 ` [kernel-hardening] " Kees Cook 2016-07-04 22:31 [PATCH -v2 0/3] x86/MSR: Improve unhandled MSR access error message Borislav Petkov 2016-07-04 22:31 ` [PATCH -v2 1/3] x86/dumpstack: Honor supplied @regs arg Borislav Petkov 2016-07-04 22:31 ` [PATCH -v2 2/3] printk: Make the printk*once() variants return a value Borislav Petkov 2016-07-08 12:08 ` [tip:x86/debug] " tip-bot for Borislav Petkov 2016-07-09 2:40 ` Joe Perches 2016-07-09 7:50 ` Borislav Petkov 2016-07-09 17:56 ` Joe Perches 2016-07-10 6:49 ` Borislav Petkov 2016-07-10 8:23 ` Joe Perches 2016-07-10 12:06 ` Borislav Petkov 2016-07-10 12:33 ` Joe Perches 2016-07-04 22:31 ` [PATCH -v2 3/3] x86/dumpstack: Add show_stack_regs() and use it Borislav Petkov 2016-07-08 12:08 ` [tip:x86/debug] " tip-bot for Borislav Petkov 2016-07-06 12:58 ` [PATCH -v2 0/3] x86/MSR: Improve unhandled MSR access error message Andy Lutomirski 2016-07-06 13:11 ` Borislav Petkov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=fdee1749f758de33fed9ab8227b6afaa56388b63.1466036668.git.luto@kernel.org \ --to=luto@kernel.org \ --cc=bp@alien8.de \ --cc=brgerst@gmail.com \ --cc=jpoimboe@redhat.com \ --cc=keescook@chromium.org \ --cc=kernel-hardening@lists.openwall.com \ --cc=linux-kernel@vger.kernel.org \ --cc=nadav.amit@gmail.com \ --cc=torvalds@linux-foundation.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.