From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758716AbcIPJSB (ORCPT ); Fri, 16 Sep 2016 05:18:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37064 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755669AbcIPJRw (ORCPT ); Fri, 16 Sep 2016 05:17:52 -0400 Date: Fri, 16 Sep 2016 02:16:54 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: bp@alien8.de, jann@thejh.net, hpa@zytor.com, brgerst@gmail.com, luto@kernel.org, mingo@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, dvlasenk@redhat.com, torvalds@linux-foundation.org, peterz@infradead.org, tglx@linutronix.de Reply-To: mingo@kernel.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, dvlasenk@redhat.com, bp@alien8.de, jann@thejh.net, brgerst@gmail.com, hpa@zytor.com, luto@kernel.org, peterz@infradead.org, tglx@linutronix.de In-Reply-To: <17a434f50ad3d77000104f21666575e10a9c1fbd.1474003868.git.luto@kernel.org> References: <17a434f50ad3d77000104f21666575e10a9c1fbd.1474003868.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] sched/core: Add try_get_task_stack() and put_task_stack() Git-Commit-ID: c6c314a613cd7d03fb97713e0d642b493de42e69 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c6c314a613cd7d03fb97713e0d642b493de42e69 Gitweb: http://git.kernel.org/tip/c6c314a613cd7d03fb97713e0d642b493de42e69 Author: Andy Lutomirski AuthorDate: Thu, 15 Sep 2016 22:45:43 -0700 Committer: Ingo Molnar CommitDate: Fri, 16 Sep 2016 09:18:53 +0200 sched/core: Add try_get_task_stack() and put_task_stack() There are a few places in the kernel that access stack memory belonging to a different task. Before we can start freeing task stacks before the task_struct is freed, we need a way for those code paths to pin the stack. Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jann Horn Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/17a434f50ad3d77000104f21666575e10a9c1fbd.1474003868.git.luto@kernel.org Signed-off-by: Ingo Molnar --- include/linux/sched.h | 16 ++++++++++++++++ init/Kconfig | 3 +++ 2 files changed, 19 insertions(+) diff --git a/include/linux/sched.h b/include/linux/sched.h index a287e8b..a958672 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -3094,11 +3094,19 @@ static inline struct thread_info *task_thread_info(struct task_struct *task) { return &task->thread_info; } + +/* + * When accessing the stack of a non-current task that might exit, use + * try_get_task_stack() instead. task_stack_page will return a pointer + * that could get freed out from under you. + */ static inline void *task_stack_page(const struct task_struct *task) { return task->stack; } + #define setup_thread_stack(new,old) do { } while(0) + static inline unsigned long *end_of_stack(const struct task_struct *task) { return task->stack; @@ -3134,6 +3142,14 @@ static inline unsigned long *end_of_stack(struct task_struct *p) } #endif + +static inline void *try_get_task_stack(struct task_struct *tsk) +{ + return task_stack_page(tsk); +} + +static inline void put_task_stack(struct task_struct *tsk) {} + #define task_stack_end_corrupted(task) \ (*(end_of_stack(task)) != STACK_END_MAGIC) diff --git a/init/Kconfig b/init/Kconfig index ec8d438..3b9a47f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -33,6 +33,9 @@ config THREAD_INFO_IN_TASK make this work, an arch will need to remove all thread_info fields except flags and fix any runtime bugs. + One subtle change that will be needed is to use try_get_task_stack() + and put_task_stack() in save_thread_stack_tsk() and get_wchan(). + menu "General setup" config BROKEN