aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/exit.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 782b2e1f7ca2..ef2dfa818bf1 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -1112,8 +1112,6 @@ static struct pid *task_pid_type(struct task_struct *task, enum pid_type type)
1112 1112
1113static int eligible_child(struct wait_opts *wo, struct task_struct *p) 1113static int eligible_child(struct wait_opts *wo, struct task_struct *p)
1114{ 1114{
1115 int err;
1116
1117 if (wo->wo_type < PIDTYPE_MAX) { 1115 if (wo->wo_type < PIDTYPE_MAX) {
1118 if (task_pid_type(p, wo->wo_type) != wo->wo_pid) 1116 if (task_pid_type(p, wo->wo_type) != wo->wo_pid)
1119 return 0; 1117 return 0;
@@ -1128,10 +1126,6 @@ static int eligible_child(struct wait_opts *wo, struct task_struct *p)
1128 && !(wo->wo_flags & __WALL)) 1126 && !(wo->wo_flags & __WALL))
1129 return 0; 1127 return 0;
1130 1128
1131 err = security_task_wait(p);
1132 if (err)
1133 return err;
1134
1135 return 1; 1129 return 1;
1136} 1130}
1137 1131
@@ -1492,6 +1486,7 @@ static int wait_consider_task(struct wait_opts *wo, struct task_struct *parent,
1492 if (!ret) 1486 if (!ret)
1493 return ret; 1487 return ret;
1494 1488
1489 ret = security_task_wait(p);
1495 if (unlikely(ret < 0)) { 1490 if (unlikely(ret < 0)) {
1496 /* 1491 /*
1497 * If we have not yet seen any eligible child, 1492 * If we have not yet seen any eligible child,