diff options
author | 2018-12-03 11:42:17 +0100 | |
---|---|---|
committer | 2018-12-03 11:42:17 +0100 | |
commit | 5f675231e456cb599b283f8361f01cf34b0617df (patch) | |
tree | afb2bdfd6fdbb18336146f41ba7659120a5ff9d2 /kernel/fork.c | |
parent | sched/core: Clean up the #ifdef block in add_nr_running() (diff) | |
parent | Linux 4.20-rc5 (diff) | |
download | wireguard-linux-5f675231e456cb599b283f8361f01cf34b0617df.tar.xz wireguard-linux-5f675231e456cb599b283f8361f01cf34b0617df.zip |
Merge tag 'v4.20-rc5' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
-rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 8f82a3bdcb8f..07cddff89c7b 100644 --- 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)) { |