aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/fork.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index 19908b26cf80..d428336e7aa1 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -54,6 +54,7 @@
54#include <linux/tty.h> 54#include <linux/tty.h>
55#include <linux/proc_fs.h> 55#include <linux/proc_fs.h>
56#include <linux/blkdev.h> 56#include <linux/blkdev.h>
57#include <linux/magic.h>
57 58
58#include <asm/pgtable.h> 59#include <asm/pgtable.h>
59#include <asm/pgalloc.h> 60#include <asm/pgalloc.h>
@@ -186,6 +187,8 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
186{ 187{
187 struct task_struct *tsk; 188 struct task_struct *tsk;
188 struct thread_info *ti; 189 struct thread_info *ti;
190 unsigned long *stackend;
191
189 int err; 192 int err;
190 193
191 prepare_to_copy(orig); 194 prepare_to_copy(orig);
@@ -211,6 +214,8 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
211 goto out; 214 goto out;
212 215
213 setup_thread_stack(tsk, orig); 216 setup_thread_stack(tsk, orig);
217 stackend = end_of_stack(tsk);
218 *stackend = STACK_END_MAGIC; /* for overflow detection */
214 219
215#ifdef CONFIG_CC_STACKPROTECTOR 220#ifdef CONFIG_CC_STACKPROTECTOR
216 tsk->stack_canary = get_random_int(); 221 tsk->stack_canary = get_random_int();