Merge branch 'qed-Miscellaneous-bug-fixes'

[sfrench/cifs-2.6.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index 8f82a3bdcb8feff10a8ce4c8d608a406890b6673..07cddff89c7b6bac3658c8cb41dd32dc64a3cfa4 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -91,6 +91,7 @@
 #include <linux/kcov.h>
 #include <linux/livepatch.h>
 #include <linux/thread_info.h>
+#include <linux/stackleak.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -1926,6 +1927,8 @@ static __latent_entropy struct task_struct *copy_process(
        if (retval)
                goto bad_fork_cleanup_io;
 
+       stackleak_task_init(p);
+
        if (pid != &init_struct_pid) {
                pid = alloc_pid(p->nsproxy->pid_ns_for_children);
                if (IS_ERR(pid)) {