UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ptrace: do not use task->ptrace directly in core kernel 

No functional changes.

- Nobody except ptrace.c & co should use ptrace flags directly, we have
  task_ptrace() for that.

- No need to specially check PT_PTRACED, we must not have other PT_ bits
  set without PT_PTRACED. And no need to know this flag exists.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oleg Nesterov 2009-06-17 16:27:30 -07:00 committed by Linus Torvalds
parent 1c21627953
commit 5cb1144689
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/exit.c
View File

@ -757,7 +757,7 @@ static void reparent_thread(struct task_struct *father, struct task_struct *p,
p->exit_signal = SIGCHLD; p->exit_signal = SIGCHLD;
/* If it has exited notify the new parent about this child's death. */ /* If it has exited notify the new parent about this child's death. */
if (!p->ptrace && if (!task_ptrace(p) &&
p->exit_state == EXIT_ZOMBIE && thread_group_empty(p)) { p->exit_state == EXIT_ZOMBIE && thread_group_empty(p)) {
do_notify_parent(p, p->exit_signal); do_notify_parent(p, p->exit_signal);
if (task_detached(p)) { if (task_detached(p)) {
@ -782,7 +782,7 @@ static void forget_original_parent(struct task_struct *father)
list_for_each_entry_safe(p, n, &father->children, sibling) { list_for_each_entry_safe(p, n, &father->children, sibling) {
p->real_parent = reaper; p->real_parent = reaper;
if (p->parent == father) { if (p->parent == father) {
BUG_ON(p->ptrace); BUG_ON(task_ptrace(p));
p->parent = p->real_parent; p->parent = p->real_parent;
} }
reparent_thread(father, p, &dead_children); reparent_thread(father, p, &dead_children);
@ -1482,7 +1482,7 @@ static int wait_consider_task(struct task_struct *parent, int ptrace,
return 0; return 0;
} }
if (likely(!ptrace) && unlikely(p->ptrace)) { if (likely(!ptrace) && unlikely(task_ptrace(p))) {
/* /*
* This child is hidden by ptrace. * This child is hidden by ptrace.
* We aren't allowed to see it now, but eventually we will. * We aren't allowed to see it now, but eventually we will.

10
kernel/signal.c
View File

@ -1410,7 +1410,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
/* do_notify_parent_cldstop should have been called instead. */ /* do_notify_parent_cldstop should have been called instead. */
BUG_ON(task_is_stopped_or_traced(tsk)); BUG_ON(task_is_stopped_or_traced(tsk));
BUG_ON(!tsk->ptrace && BUG_ON(!task_ptrace(tsk) &&
(tsk->group_leader != tsk || !thread_group_empty(tsk))); (tsk->group_leader != tsk || !thread_group_empty(tsk)));
info.si_signo = sig; info.si_signo = sig;
@ -1449,7 +1449,7 @@ int do_notify_parent(struct task_struct *tsk, int sig)
psig = tsk->parent->sighand; psig = tsk->parent->sighand;
spin_lock_irqsave(&psig->siglock, flags); spin_lock_irqsave(&psig->siglock, flags);
if (!tsk->ptrace && sig == SIGCHLD && if (!task_ptrace(tsk) && sig == SIGCHLD &&
(psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN ||
(psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) { (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) {
/* /*
@ -1486,7 +1486,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, int why)
struct task_struct *parent; struct task_struct *parent;
struct sighand_struct *sighand; struct sighand_struct *sighand;
if (tsk->ptrace & PT_PTRACED) if (task_ptrace(tsk))
parent = tsk->parent; parent = tsk->parent;
else { else {
tsk = tsk->group_leader; tsk = tsk->group_leader;
@ -1535,7 +1535,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, int why)
static inline int may_ptrace_stop(void) static inline int may_ptrace_stop(void)
{ {
if (!likely(current->ptrace & PT_PTRACED)) if (!likely(task_ptrace(current)))
return 0; return 0;
/* /*
* Are we in the middle of do_coredump? * Are we in the middle of do_coredump?
@ -1753,7 +1753,7 @@ static int do_signal_stop(int signr)
static int ptrace_signal(int signr, siginfo_t *info, static int ptrace_signal(int signr, siginfo_t *info,
struct pt_regs *regs, void *cookie) struct pt_regs *regs, void *cookie)
{ {
if (!(current->ptrace & PT_PTRACED)) if (!task_ptrace(current))
return signr; return signr;
ptrace_signal_deliver(regs, cookie); ptrace_signal_deliver(regs, cookie);