diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-31 11:11:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-31 11:11:35 +0100 |
| commit | 0e73453e172aaa38fd59fd4d3fc589e8fc9b9a70 (patch) | |
| tree | f651a01eb98dd5454d433da9ae35579242a2cb36 /kernel/fork.c | |
| parent | 5a3126d4fe7c311fe12f98fef0470f6cb582d1ef (diff) | |
| parent | 3ab679661721b1ec2aaad99a801870ed59ab1110 (diff) | |
Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core
Fix uprobes bugs that happen if fork() is called with pending ret-probes,
from Oleg Nesterov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 086fe73ad6bd..8531609b6a82 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1373,7 +1373,6 @@ static struct task_struct *copy_process(unsigned long clone_flags, INIT_LIST_HEAD(&p->pi_state_list); p->pi_state_cache = NULL; #endif - uprobe_copy_process(p); /* * sigaltstack should be cleared when sharing the same VM */ @@ -1490,6 +1489,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, perf_event_fork(p); trace_task_newtask(p, clone_flags); + uprobe_copy_process(p, clone_flags); return p; |