iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] don't use REMOVE_LINKS/SET_LINKS for reparenting

Browse Source 
There are places where kernel uses REMOVE_LINKS/SET_LINKS while changing
process's ->parent.  Use add_parent/remove_parent instead, they don't abuse
of global process list.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Oleg Nesterov 2006-03-28 16:11:05 -08:00 committed by Linus Torvalds
parent 8fafabd86f
commit 9b678ece42
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/exit.c
View File

@ -238,10 +238,10 @@ static void reparent_to_init(void)
ptrace_unlink(current); ptrace_unlink(current);
/* Reparent to init */ /* Reparent to init */
REMOVE_LINKS(current); remove_parent(current);
current->parent = child_reaper; current->parent = child_reaper;
current->real_parent = child_reaper; current->real_parent = child_reaper;
SET_LINKS(current); add_parent(current);
/* Set the exit signal to SIGCHLD so we signal init on exit */ /* Set the exit signal to SIGCHLD so we signal init on exit */
current->exit_signal = SIGCHLD; current->exit_signal = SIGCHLD;

8
kernel/ptrace.c
View File

@ -35,9 +35,9 @@ void __ptrace_link(task_t *child, task_t *new_parent)
if (child->parent == new_parent) if (child->parent == new_parent)
return; return;
list_add(&child->ptrace_list, &child->parent->ptrace_children); list_add(&child->ptrace_list, &child->parent->ptrace_children);
REMOVE_LINKS(child); remove_parent(child);
child->parent = new_parent; child->parent = new_parent;
SET_LINKS(child); add_parent(child);
} }
/* /*
@ -77,9 +77,9 @@ void __ptrace_unlink(task_t *child)
child->ptrace = 0; child->ptrace = 0;
if (!list_empty(&child->ptrace_list)) { if (!list_empty(&child->ptrace_list)) {
list_del_init(&child->ptrace_list); list_del_init(&child->ptrace_list);
REMOVE_LINKS(child); remove_parent(child);
child->parent = child->real_parent; child->parent = child->real_parent;
SET_LINKS(child); add_parent(child);
} }
ptrace_untrace(child); ptrace_untrace(child);