diff options
| author |   Oleg Nesterov <oleg@redhat.com> | 2013-10-13 21:18:31 +0200 |
|---|---|---|
| committer | Oleg Nesterov <oleg@redhat.com> | 2013-10-29 18:02:48 +0100 |
| commit | b68e0749100e1b901bf11330f149b321c082178e (patch) | |
| tree | e6950bc5bafbb845ce1f7650e738e6aac7e12b12 /kernel/fork.c | |
| parent | uprobes: Remove the wrong __weak attribute (diff) | |
| download | linux-dev-b68e0749100e1b901bf11330f149b321c082178e.tar.xz linux-dev-b68e0749100e1b901bf11330f149b321c082178e.zip | |
uprobes: Change the callsite of uprobe_copy_process()
Preparation for the next patches.
Move the callsite of uprobe_copy_process() in copy_process() down
to the succesfull return. We do not care if copy_process() fails,
uprobe_free_utask() won't be called in this case so the wrong
->utask != NULL doesn't matter.
OTOH, with this change we know that copy_process() can't fail when
uprobe_copy_process() is called, the new task should either return
to user-mode or call do_exit(). This way uprobe_copy_process() can:
1. setup p->utask != NULL if necessary
2. setup uprobes_state.xol_area
3. use task_work_add(p)
Also, move the definition of uprobe_copy_process() down so that it
can see get_utask().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
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..d3603b81246b 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); return p; |