Skip to content

Commit

Permalink
sched/core: Add try_get_task_stack() and put_task_stack()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Brian Gerst <[email protected]>
Cc: Denys Vlasenko <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Jann Horn <[email protected]>
Cc: Josh Poimboeuf <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/17a434f50ad3d77000104f21666575e10a9c1fbd.1474003868.git.luto@kernel.org
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
amluto authored and Ingo Molnar committed Sep 16, 2016
1 parent ff0071c commit c6c314a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
16 changes: 16 additions & 0 deletions include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)

Expand Down
3 changes: 3 additions & 0 deletions init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c6c314a

Please sign in to comment.