diff options
Diffstat (limited to 'kernel/signal.c')
-rw-r--r-- | kernel/signal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index d81f4952eebb..09ccc1c0e1f8 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -1410,7 +1410,7 @@ int do_notify_parent(struct task_struct *tsk, int sig) | |||
1410 | /* do_notify_parent_cldstop should have been called instead. */ | 1410 | /* do_notify_parent_cldstop should have been called instead. */ |
1411 | BUG_ON(task_is_stopped_or_traced(tsk)); | 1411 | BUG_ON(task_is_stopped_or_traced(tsk)); |
1412 | 1412 | ||
1413 | BUG_ON(!tsk->ptrace && | 1413 | BUG_ON(!task_ptrace(tsk) && |
1414 | (tsk->group_leader != tsk || !thread_group_empty(tsk))); | 1414 | (tsk->group_leader != tsk || !thread_group_empty(tsk))); |
1415 | 1415 | ||
1416 | info.si_signo = sig; | 1416 | info.si_signo = sig; |
@@ -1449,7 +1449,7 @@ int do_notify_parent(struct task_struct *tsk, int sig) | |||
1449 | 1449 | ||
1450 | psig = tsk->parent->sighand; | 1450 | psig = tsk->parent->sighand; |
1451 | spin_lock_irqsave(&psig->siglock, flags); | 1451 | spin_lock_irqsave(&psig->siglock, flags); |
1452 | if (!tsk->ptrace && sig == SIGCHLD && | 1452 | if (!task_ptrace(tsk) && sig == SIGCHLD && |
1453 | (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || | 1453 | (psig->action[SIGCHLD-1].sa.sa_handler == SIG_IGN || |
1454 | (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) { | 1454 | (psig->action[SIGCHLD-1].sa.sa_flags & SA_NOCLDWAIT))) { |
1455 | /* | 1455 | /* |
@@ -1486,7 +1486,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, int why) | |||
1486 | struct task_struct *parent; | 1486 | struct task_struct *parent; |
1487 | struct sighand_struct *sighand; | 1487 | struct sighand_struct *sighand; |
1488 | 1488 | ||
1489 | if (tsk->ptrace & PT_PTRACED) | 1489 | if (task_ptrace(tsk)) |
1490 | parent = tsk->parent; | 1490 | parent = tsk->parent; |
1491 | else { | 1491 | else { |
1492 | tsk = tsk->group_leader; | 1492 | tsk = tsk->group_leader; |
@@ -1535,7 +1535,7 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, int why) | |||
1535 | 1535 | ||
1536 | static inline int may_ptrace_stop(void) | 1536 | static inline int may_ptrace_stop(void) |
1537 | { | 1537 | { |
1538 | if (!likely(current->ptrace & PT_PTRACED)) | 1538 | if (!likely(task_ptrace(current))) |
1539 | return 0; | 1539 | return 0; |
1540 | /* | 1540 | /* |
1541 | * Are we in the middle of do_coredump? | 1541 | * Are we in the middle of do_coredump? |
@@ -1753,7 +1753,7 @@ static int do_signal_stop(int signr) | |||
1753 | static int ptrace_signal(int signr, siginfo_t *info, | 1753 | static int ptrace_signal(int signr, siginfo_t *info, |
1754 | struct pt_regs *regs, void *cookie) | 1754 | struct pt_regs *regs, void *cookie) |
1755 | { | 1755 | { |
1756 | if (!(current->ptrace & PT_PTRACED)) | 1756 | if (!task_ptrace(current)) |
1757 | return signr; | 1757 | return signr; |
1758 | 1758 | ||
1759 | ptrace_signal_deliver(regs, cookie); | 1759 | ptrace_signal_deliver(regs, cookie); |